From 7f66c1b63b24bf381f39c02ff99d20d1340d0633 Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Wed, 5 Aug 2020 13:54:47 +0900 Subject: [PATCH] configs: rpi_3: disable configs relevant to SPL Disable configs relevant to SPL. It doesn't need to enable anymore. Change-Id: Idbe37b441e7dc3e2488a2db154522257f2c08722 Signed-off-by: Jaehoon Chung --- configs/rpi_3_defconfig | 34 ++++------------------------------ include/samsung/tizen_rpi.h | 10 ---------- 2 files changed, 4 insertions(+), 40 deletions(-) diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig index 7513dc7..cc25156 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -3,46 +3,24 @@ CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_BCM283X=y CONFIG_SYS_TEXT_BASE=0x00080000 CONFIG_TARGET_RPI_3=y -CONFIG_NR_DRAM_BANKS=1 -CONFIG_MISC_INIT_R=y -CONFIG_SPL_GPIO_SUPPORT=y -CONFIG_SPL_LIBCOMMON_SUPPORT=y -CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x20000 -CONFIG_SPL_MMC_SUPPORT=y -CONFIG_SPL_SERIAL_SUPPORT=y -CONFIG_SPL_DRIVERS_MISC_SUPPORT=y -CONFIG_SPL_LIBDISK_SUPPORT=y -CONFIG_SPL_FAT_SUPPORT=y -CONFIG_SPL_STACK_R_ADDR=0xB000000 -CONFIG_SPL_TEXT_BASE=0x00008000 +CONFIG_NR_DRAM_BANKS=1 CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y -CONFIG_SPL_FS_FAT=y -CONFIG_SPL_FIT=y -CONFIG_SPL_LOAD_FIT=y CONFIG_OF_BOARD_SETUP=y +CONFIG_SD_BOOT=y CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="usb start" CONFIG_MISC_INIT_R=y -CONFIG_SD_BOOT=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_SPL=y -CONFIG_SPL_SYS_MALLOC_SIMPLE=y -CONFIG_SPL_STACK_R=y -CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x200000 -CONFIG_SPL_SEPARATE_BSS=y -CONFIG_SPL_ENV_SUPPORT=y -CONFIG_SPL_ATF=y -CONFIG_SPL_ATF_SUPPORT=y -CONFIG_SPL_BOARD_INIT=y CONFIG_SYS_PROMPT="U-Boot> " # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_TIZEN_DOWNLOAD=y +CONFIG_CMD_TIME=y CONFIG_CMD_FS_UUID=y CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" @@ -52,15 +30,11 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DFU_MMC=y CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y -CONFIG_SPL_OF_CONTROL=y -CONFIG_SPL_DM=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_BCM2835=y -CONFIG_MMC_BCM2835=y CONFIG_PHYLIB=y CONFIG_DM_ETH=y CONFIG_PINCTRL=y -CONFIG_SPL_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set CONFIG_USB=y @@ -75,5 +49,5 @@ CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_SPL_OF_LIBFDT=y # CONFIG_EFI_LOADER is not set -CONFIG_CMD_TIME=y diff --git a/include/samsung/tizen_rpi.h b/include/samsung/tizen_rpi.h index 522b704..cd9018a 100644 --- a/include/samsung/tizen_rpi.h +++ b/include/samsung/tizen_rpi.h @@ -9,16 +9,6 @@ #ifndef __CONFIG_TIZEN_RPI_H #define __CONFIG_TIZEN_RPI_H -/* SPL */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SPL_ATF_TEXT_BASE 0x08400000 -#define CONFIG_SPL_MAX_SIZE 0x00030000 -#define CONFIG_SPL_BSS_START_ADDR 0x00380000 -#define CONFIG_SPL_BSS_MAX_SIZE 0x00040000 -#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 -#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#endif - /* DFU */ #define CONFIG_DFU_ALT_SYSTEM \ "Image fat 0 1;" \ -- 2.7.4