You're probably going to need to change this around now that the Kconfig stuff has been applied to master. Suggest following patch instead:
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 1aac3c8..dc471d6 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -36,7 +36,7 @@ config ROCKCHIP_RK3399
config ROCKCHIP_SPL_BACK_TO_BROM bool "SPL returns to bootrom" - default y if ROCKCHIP_RK3036 + default y if ROCKCHIP_RK3036 || ROCKCHIP_RK3288 help Rockchip SoCs have ability to load SPL & U-Boot binary. If enabled, SPL will return to the boot rom, which will then load the U-Boot diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig index 94863a9..1425ce1 100644 --- a/arch/arm/mach-rockchip/rk3288/Kconfig +++ b/arch/arm/mach-rockchip/rk3288/Kconfig @@ -82,7 +82,7 @@ config SPL_LIBGENERIC_SUPPORT default y
config SPL_MMC_SUPPORT - default y + default y if !ROCKCHIP_SPL_BACK_TO_BROM
config SPL_SERIAL_SUPPORT default y
On Mon, Sep 19, 2016 at 11:28 PM, Kever Yang kever.yang@rock-chips.com wrote:
Enable ROCKCHIP_SPL_BACK_TO_BROM and disable CONFIG_SPL_MMC_SUPPORT to save memory in order to enable add source code for dram capacity auto-detect.
Signed-off-by: Kever Yang kever.yang@rock-chips.com
Changes in v2: None
include/configs/evb_rk3288.h | 3 +-- include/configs/fennec_rk3288.h | 3 +-- include/configs/miniarm_rk3288.h | 3 +-- include/configs/popmetal_rk3288.h | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/include/configs/evb_rk3288.h b/include/configs/evb_rk3288.h index 342557f..9f32184 100644 --- a/include/configs/evb_rk3288.h +++ b/include/configs/evb_rk3288.h @@ -7,11 +7,10 @@ #ifndef __CONFIG_H #define __CONFIG_H
+#define CONFIG_ROCKCHIP_SPL_BACK_TO_BROM #define ROCKCHIP_DEVICE_SETTINGS #include <configs/rk3288_common.h>
-#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* SPL @ 32k for ~36k diff --git a/include/configs/fennec_rk3288.h b/include/configs/fennec_ rk3288.h index 342557f..9f32184 100644 --- a/include/configs/fennec_rk3288.h +++ b/include/configs/fennec_rk3288.h @@ -7,11 +7,10 @@ #ifndef __CONFIG_H #define __CONFIG_H
+#define CONFIG_ROCKCHIP_SPL_BACK_TO_BROM #define ROCKCHIP_DEVICE_SETTINGS #include <configs/rk3288_common.h>
-#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* SPL @ 32k for ~36k diff --git a/include/configs/miniarm_rk3288.h b/include/configs/miniarm_ rk3288.h index 342557f..9f32184 100644 --- a/include/configs/miniarm_rk3288.h +++ b/include/configs/miniarm_rk3288.h @@ -7,11 +7,10 @@ #ifndef __CONFIG_H #define __CONFIG_H
+#define CONFIG_ROCKCHIP_SPL_BACK_TO_BROM #define ROCKCHIP_DEVICE_SETTINGS #include <configs/rk3288_common.h>
-#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* SPL @ 32k for ~36k diff --git a/include/configs/popmetal_rk3288.h b/include/configs/popmetal_ rk3288.h index 342557f..9f32184 100644 --- a/include/configs/popmetal_rk3288.h +++ b/include/configs/popmetal_rk3288.h @@ -7,11 +7,10 @@ #ifndef __CONFIG_H #define __CONFIG_H
+#define CONFIG_ROCKCHIP_SPL_BACK_TO_BROM #define ROCKCHIP_DEVICE_SETTINGS #include <configs/rk3288_common.h>
-#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* SPL @ 32k for ~36k -- 1.9.1