From d1dd3e78008393b0279e81bc2154874fe1387b43 Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Mon, 17 Oct 2022 09:13:18 +0900 Subject: [PATCH] configs: tizen_rpi: enable CONFIG_SYS_INIT_SP_ADDR Enable CONFIG_SYS_INIT_SP_ADDR in rpi3/4 configuration. Change-Id: Id4b4c269631fb58c1e24a431c6588ce9bcca43a2 Signed-off-by: Jaehoon Chung --- configs/tizen_rpi_3_32b_defconfig | 5 +++-- configs/tizen_rpi_3_defconfig | 5 +++-- configs/tizen_rpi_4_32b_defconfig | 5 +++-- configs/tizen_rpi_4_defconfig | 5 +++-- include/configs/rpi.h | 7 ------- 5 files changed, 12 insertions(+), 15 deletions(-) diff --git a/configs/tizen_rpi_3_32b_defconfig b/configs/tizen_rpi_3_32b_defconfig index de96f84..8b5beb0 100644 --- a/configs/tizen_rpi_3_32b_defconfig +++ b/configs/tizen_rpi_3_32b_defconfig @@ -7,15 +7,17 @@ CONFIG_TARGET_RPI_3_32B=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7fffee0 CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y CONFIG_FDT_SIMPLEFB=y -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_ASKENV=y CONFIG_CMD_GPIO=y CONFIG_CMD_MBR=y @@ -33,7 +35,6 @@ CONFIG_DFU_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_BCM2835=y CONFIG_PHYLIB=y -CONFIG_DM_ETH=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set diff --git a/configs/tizen_rpi_3_defconfig b/configs/tizen_rpi_3_defconfig index 7b45361..85ab33d 100644 --- a/configs/tizen_rpi_3_defconfig +++ b/configs/tizen_rpi_3_defconfig @@ -7,15 +7,17 @@ CONFIG_TARGET_RPI_3=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7fffee0 CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y CONFIG_FDT_SIMPLEFB=y -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_ASKENV=y CONFIG_CMD_GPIO=y CONFIG_CMD_MBR=y @@ -34,7 +36,6 @@ CONFIG_DFU_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_BCM2835=y CONFIG_PHYLIB=y -CONFIG_DM_ETH=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set diff --git a/configs/tizen_rpi_4_32b_defconfig b/configs/tizen_rpi_4_32b_defconfig index b663444..208b276 100644 --- a/configs/tizen_rpi_4_32b_defconfig +++ b/configs/tizen_rpi_4_32b_defconfig @@ -6,8 +6,11 @@ CONFIG_TARGET_RPI_4_32B=y CONFIG_TIZEN_RPI4=y CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="bcm2711-rpi-4-b" +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7fffee0 CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y CONFIG_SYS_STDIO_DEREGISTER=y @@ -16,7 +19,6 @@ CONFIG_SYS_STDIO_DEREGISTER=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_MISC_INIT_R=y CONFIG_FDT_SIMPLEFB=y -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_ASKENV=y CONFIG_CMD_DFU=y @@ -46,7 +48,6 @@ CONFIG_BCM2835_GPIO=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_BCM2835=y -CONFIG_DM_ETH=y CONFIG_BCMGENET=y CONFIG_PCI=y CONFIG_PCI_BRCMSTB=y diff --git a/configs/tizen_rpi_4_defconfig b/configs/tizen_rpi_4_defconfig index 1cad1c1..e5ce8ce 100644 --- a/configs/tizen_rpi_4_defconfig +++ b/configs/tizen_rpi_4_defconfig @@ -6,8 +6,11 @@ CONFIG_TARGET_RPI_4=y CONFIG_TIZEN_RPI4=y CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="bcm2711-rpi-4-b" +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7fffee0 CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y CONFIG_SYS_STDIO_DEREGISTER=y @@ -16,7 +19,6 @@ CONFIG_SYS_STDIO_DEREGISTER=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_MISC_INIT_R=y CONFIG_FDT_SIMPLEFB=y -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_ASKENV=y CONFIG_CMD_DFU=y @@ -46,7 +48,6 @@ CONFIG_BCM2835_GPIO=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_BCM2835=y -CONFIG_DM_ETH=y CONFIG_BCMGENET=y CONFIG_PCI=y CONFIG_PCI_BRCMSTB=y diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 7cf2e74..3eb0b3f 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -34,13 +34,6 @@ * the VC uses. */ #define CONFIG_SYS_SDRAM_SIZE SZ_128M -#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + \ - CONFIG_SYS_SDRAM_SIZE - \ - GENERATED_GBL_DATA_SIZE) - -#ifdef CONFIG_ARM64 -#define CONFIG_SYS_BOOTM_LEN SZ_64M -#endif /* Devices */ /* LCD */ -- 2.7.4