From ed7c1b3d5b895f50632be2e3189b98f2c4989d1a Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Fri, 29 Jul 2022 10:09:18 +0900 Subject: [PATCH] configs: tizen_rpi_3/4_defconfig: Update the missed configurations Update the missed configurations. After version is updated, some configurations has to be defined in defconfig. Change-Id: I992ba76585f6075d3c213c04ebbef1134b200f4c Signed-off-by: Jaehoon Chung --- configs/tizen_rpi_3_32b_defconfig | 4 +++- configs/tizen_rpi_3_defconfig | 7 ++++--- configs/tizen_rpi_4_32b_defconfig | 7 +++++-- configs/tizen_rpi_4_defconfig | 8 ++++++-- include/configs/rpi.h | 2 -- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/configs/tizen_rpi_3_32b_defconfig b/configs/tizen_rpi_3_32b_defconfig index 94e5142..de96f84 100644 --- a/configs/tizen_rpi_3_32b_defconfig +++ b/configs/tizen_rpi_3_32b_defconfig @@ -2,17 +2,19 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_BCM283X=y CONFIG_SYS_TEXT_BASE=0x00008000 +CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_TARGET_RPI_3_32B=y -CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" +CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_DISTRO_DEFAULTS=y 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 diff --git a/configs/tizen_rpi_3_defconfig b/configs/tizen_rpi_3_defconfig index 2dfbfca..7b45361 100644 --- a/configs/tizen_rpi_3_defconfig +++ b/configs/tizen_rpi_3_defconfig @@ -2,17 +2,19 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_BCM283X=y CONFIG_SYS_TEXT_BASE=0x00080000 +CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_TARGET_RPI_3=y -CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" +CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_DISTRO_DEFAULTS=y 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 @@ -20,6 +22,7 @@ CONFIG_CMD_MBR=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_TIZEN_DOWNLOAD=y +CONFIG_CMD_TIME=y CONFIG_CMD_SQUASHFS=y CONFIG_CMD_FS_UUID=y CONFIG_OF_EMBED=y @@ -30,7 +33,6 @@ CONFIG_TFTP_TSIZE=y CONFIG_DFU_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_BCM2835=y -CONFIG_MMC_BCM2835=y CONFIG_PHYLIB=y CONFIG_DM_ETH=y CONFIG_PINCTRL=y @@ -51,4 +53,3 @@ CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=y -CONFIG_CMD_TIME=y diff --git a/configs/tizen_rpi_4_32b_defconfig b/configs/tizen_rpi_4_32b_defconfig index c64ec5e..b663444 100644 --- a/configs/tizen_rpi_4_32b_defconfig +++ b/configs/tizen_rpi_4_32b_defconfig @@ -1,10 +1,12 @@ CONFIG_ARM=y CONFIG_ARCH_BCM283X=y CONFIG_SYS_TEXT_BASE=0x00008000 +CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_TARGET_RPI_4_32B=y CONFIG_TIZEN_RPI4=y -CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ENV_SIZE=0x4000 +CONFIG_DEFAULT_DEVICE_TREE="bcm2711-rpi-4-b" +CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y @@ -13,6 +15,7 @@ CONFIG_SYS_STDIO_DEREGISTER=y # CONFIG_DISPLAY_BOARDINFO is not set 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 @@ -30,7 +33,6 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_SQUASHFS=y CONFIG_CMD_FS_UUID=y CONFIG_PARTITION_TYPE_GUID=y -CONFIG_OF_BOARD=y CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y @@ -40,6 +42,7 @@ CONFIG_DM_DMA=y CONFIG_DFU_MMC=y CONFIG_SYS_DFU_DATA_BUF_SIZE=0x100000 CONFIG_SYS_DFU_MAX_FILE_SIZE=0x200000 +CONFIG_BCM2835_GPIO=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_BCM2835=y diff --git a/configs/tizen_rpi_4_defconfig b/configs/tizen_rpi_4_defconfig index c30a1eb..1cad1c1 100644 --- a/configs/tizen_rpi_4_defconfig +++ b/configs/tizen_rpi_4_defconfig @@ -1,10 +1,12 @@ CONFIG_ARM=y CONFIG_ARCH_BCM283X=y CONFIG_SYS_TEXT_BASE=0x00080000 +CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_TARGET_RPI_4=y CONFIG_TIZEN_RPI4=y -CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ENV_SIZE=0x4000 +CONFIG_DEFAULT_DEVICE_TREE="bcm2711-rpi-4-b" +CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y @@ -13,6 +15,7 @@ CONFIG_SYS_STDIO_DEREGISTER=y # CONFIG_DISPLAY_BOARDINFO is not set 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 @@ -30,7 +33,6 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_SQUASHFS=y CONFIG_CMD_FS_UUID=y CONFIG_PARTITION_TYPE_GUID=y -CONFIG_OF_BOARD=y CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y @@ -40,6 +42,7 @@ CONFIG_DM_DMA=y CONFIG_DFU_MMC=y CONFIG_SYS_DFU_DATA_BUF_SIZE=0x100000 CONFIG_SYS_DFU_MAX_FILE_SIZE=0x200000 +CONFIG_BCM2835_GPIO=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_BCM2835=y @@ -71,5 +74,6 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP16 is not set CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10 +CONFIG_VIDEO_DT_SIMPLEFB=y CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/include/configs/rpi.h b/include/configs/rpi.h index cda3807..7cf2e74 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -37,8 +37,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + \ CONFIG_SYS_SDRAM_SIZE - \ GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_MALLOC_LEN SZ_16M -#define CONFIG_LOADADDR 0x00200000 #ifdef CONFIG_ARM64 #define CONFIG_SYS_BOOTM_LEN SZ_64M -- 2.7.4