Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 1 | From e896d48c57d272327410416887f34ac0db550390 Mon Sep 17 00:00:00 2001 |
| 2 | From: Jon Mason <jdmason@kudzu.us> |
| 3 | Date: Mon, 13 Jun 2022 10:59:53 -0400 |
| 4 | Subject: [PATCH 2/2] Revert "vexpress64: Enable OF_CONTROL and OF_BOARD for |
| 5 | VExpress64" |
| 6 | |
| 7 | This patch only works for aarch64 (as the 'x' registers are not |
| 8 | available for ARMv7). Since this platform is ARMv7 in the previous |
| 9 | patch, this either needs to be changed or removed. I opted to remove |
| 10 | it, as it doesn't seem to be necessary to boot the virtual hardware. |
| 11 | Given that the previous patch was rejected upstream, it is not |
| 12 | appropriate to fix this upstream. |
| 13 | |
| 14 | Upstream-Status: Inappropriate |
| 15 | Signed-off-by: Jon Mason <jon.mason@arm.com> |
| 16 | |
| 17 | This reverts commit 2661397464e47d45cd25bbc5e6b9de7594b3268d. |
| 18 | --- |
| 19 | board/armltd/vexpress64/Makefile | 2 +- |
| 20 | board/armltd/vexpress64/lowlevel_init.S | 12 ------------ |
| 21 | board/armltd/vexpress64/vexpress64.c | 26 ------------------------- |
| 22 | 3 files changed, 1 insertion(+), 39 deletions(-) |
| 23 | delete mode 100644 board/armltd/vexpress64/lowlevel_init.S |
| 24 | |
| 25 | diff --git a/board/armltd/vexpress64/Makefile b/board/armltd/vexpress64/Makefile |
| 26 | index 1878fbed4ec9..868dc4f629f2 100644 |
| 27 | --- a/board/armltd/vexpress64/Makefile |
| 28 | +++ b/board/armltd/vexpress64/Makefile |
| 29 | @@ -3,5 +3,5 @@ |
| 30 | # (C) Copyright 2000-2004 |
| 31 | # Wolfgang Denk, DENX Software Engineering, wd@denx.de. |
| 32 | |
| 33 | -obj-y := vexpress64.o lowlevel_init.o |
| 34 | +obj-y := vexpress64.o |
| 35 | obj-$(CONFIG_TARGET_VEXPRESS64_JUNO) += pcie.o |
| 36 | diff --git a/board/armltd/vexpress64/lowlevel_init.S b/board/armltd/vexpress64/lowlevel_init.S |
| 37 | deleted file mode 100644 |
| 38 | index 3dcfb85d0e9a..000000000000 |
| 39 | --- a/board/armltd/vexpress64/lowlevel_init.S |
| 40 | +++ /dev/null |
| 41 | @@ -1,12 +0,0 @@ |
| 42 | -/* SPDX-License-Identifier: GPL-2.0 */ |
| 43 | -/* |
| 44 | - * (C) Copyright 2021 Arm Limited |
| 45 | - */ |
| 46 | - |
| 47 | -.global save_boot_params |
| 48 | -save_boot_params: |
| 49 | - |
| 50 | - adr x8, prior_stage_fdt_address |
| 51 | - str x0, [x8] |
| 52 | - |
| 53 | - b save_boot_params_ret |
| 54 | diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c |
| 55 | index 5e22e89824ee..cedab86d984b 100644 |
| 56 | --- a/board/armltd/vexpress64/vexpress64.c |
| 57 | +++ b/board/armltd/vexpress64/vexpress64.c |
| 58 | @@ -92,15 +92,7 @@ int dram_init_banksize(void) |
| 59 | return 0; |
| 60 | } |
| 61 | |
| 62 | -/* Assigned in lowlevel_init.S |
| 63 | - * Push the variable into the .data section so that it |
| 64 | - * does not get cleared later. |
| 65 | - */ |
| 66 | -unsigned long __section(".data") prior_stage_fdt_address; |
| 67 | - |
| 68 | #ifdef CONFIG_OF_BOARD |
| 69 | - |
| 70 | -#ifdef CONFIG_TARGET_VEXPRESS64_JUNO |
| 71 | #define JUNO_FLASH_SEC_SIZE (256 * 1024) |
| 72 | static phys_addr_t find_dtb_in_nor_flash(const char *partname) |
| 73 | { |
| 74 | @@ -145,11 +137,9 @@ static phys_addr_t find_dtb_in_nor_flash(const char *partname) |
| 75 | |
| 76 | return ~0; |
| 77 | } |
| 78 | -#endif |
| 79 | |
| 80 | void *board_fdt_blob_setup(int *err) |
| 81 | { |
| 82 | -#ifdef CONFIG_TARGET_VEXPRESS64_JUNO |
| 83 | phys_addr_t fdt_rom_addr = find_dtb_in_nor_flash(CONFIG_JUNO_DTB_PART); |
| 84 | |
| 85 | *err = 0; |
| 86 | @@ -159,22 +149,6 @@ void *board_fdt_blob_setup(int *err) |
| 87 | } |
| 88 | |
| 89 | return (void *)fdt_rom_addr; |
| 90 | -#endif |
| 91 | - |
| 92 | -#ifdef VEXPRESS_FDT_ADDR |
| 93 | - if (fdt_magic(VEXPRESS_FDT_ADDR) == FDT_MAGIC) { |
| 94 | - *err = 0; |
| 95 | - return (void *)VEXPRESS_FDT_ADDR; |
| 96 | - } |
| 97 | -#endif |
| 98 | - |
| 99 | - if (fdt_magic(prior_stage_fdt_address) == FDT_MAGIC) { |
| 100 | - *err = 0; |
| 101 | - return (void *)prior_stage_fdt_address; |
| 102 | - } |
| 103 | - |
| 104 | - *err = -ENXIO; |
| 105 | - return NULL; |
| 106 | } |
| 107 | #endif |
| 108 | |
| 109 | -- |
| 110 | 2.30.2 |
| 111 | |