rpi3: enable spl-atf build config

Enable build of spl loading atf and u-boot for raspberry pi 3.

The spl will load u-boot and atf optee image from u-boot.img as
defined CONFIG_SPL_FS_LOAD_PAYLOAD_NAME in header.

Change-Id: I482737666a0d7f446699feefda37f9b467955f4d
Signed-off-by: egukim <egukim@dignsys.com>

diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
index ce28c312832efe9f4e2d1a9c174be6f5b2f3e64d..6eed30ae83013dd53014ab1c60ee3f27039088fb 100644 (file)
--- a/configs/rpi_3_defconfig
+++ b/configs/rpi_3_defconfig
@@ -1,12 +1,32 @@
 CONFIG_ARM=y
 CONFIG_ARCH_BCM283X=y
 CONFIG_TARGET_RPI_3=y
-CONFIG_SYS_MALLOC_F_LEN=0x2000
+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_LIBDISK_SUPPORT=y
+CONFIG_SPL_FAT_SUPPORT=y
+CONFIG_SPL_STACK_R_ADDR=0xB000000
 CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b"
 CONFIG_DISTRO_DEFAULTS=y
+CONFIG_FIT=y
+CONFIG_SPL_FIT=y
+CONFIG_SPL_LOAD_FIT=y
 CONFIG_OF_BOARD_SETUP=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_SUPPORT=y
+CONFIG_SPL_ATF_TEXT_BASE=0x08400000
 CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
@@ -14,7 +34,9 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_CMD_GPIO=y
+CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
+CONFIG_SPL_DM=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_BCM2835=y
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
@@ -24,3 +46,4 @@ CONFIG_USB_KEYBOARD=y
 CONFIG_CONSOLE_SCROLL_LINES=10
 CONFIG_LCD=y
 CONFIG_PHYS_TO_BUS=y
+# CONFIG_EFI_LOADER is not set

diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index e293f2ed31cdd851b78aae4e2c0ce60affdaa0a2..72a220b0a8122855c422bf6b6088375c23223f05 100644 (file)
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -48,6 +48,19 @@
 #define CONFIG_SYS_TEXT_BASE           0x00008000
 #endif
 #define CONFIG_SYS_UBOOT_BASE          CONFIG_SYS_TEXT_BASE
+
+#ifdef CONFIG_SPL_BUILD
+#define CONFIG_SPL_FRAMEWORK
+#define CONFIG_SPL_DRIVERS_MISC_SUPPORT
+#define CONFIG_SPL_BOARD_INIT
+#define CONFIG_SPL_TEXT_BASE           0x00008000
+#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
+
 /*
  * The board really has 256M. However, the VC (VideoCore co-processor) shares
  * the RAM, and uses a configurable portion at the top. We tell U-Boot that a