diff --git a/include/configs/evb_rk3036.h b/include/configs/evb_rk3036.h index 1bfb8c9178..36be165fd5 100644 --- a/include/configs/evb_rk3036.h +++ b/include/configs/evb_rk3036.h @@ -19,13 +19,7 @@ #ifndef CONFIG_SPL_BUILD /* Enable gpt partition table */ #undef CONFIG_PREBOOT -#define CONFIG_PREBOOT \ - "mmc dev 0; " \ - "gpt guid mmc 0; " \ - "if test $? = 1; then " \ - "fastboot usb 0; " \ - "fi; " - +#define CONFIG_PREBOOT #define CONFIG_SYS_BOOT_RAMDISK_HIGH /* Store env in emmc */ diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index a1387e0d9c..026f11dac0 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -12,7 +12,7 @@ #define CONFIG_SYS_MALLOC_LEN (32 << 20) #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */ +#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */ #define CONFIG_SPL_FRAMEWORK @@ -46,7 +46,14 @@ #define CONFIG_USB_FUNCTION_MASS_STORAGE #define CONFIG_CMD_USB_MASS_STORAGE -/* usb host */ +/* memory <= 128M board */ +#define ENV_MEM_LAYOUT_SETTINGS1 \ + "scriptaddr1=0x60000000\0" \ + "pxefile_addr1_r=0x60100000\0" \ + "fdt_addr1_r=0x61f00000\0" \ + "kernel_addr1_r=0x62000000\0" \ + "ramdisk_addr1_r=0x64000000\0" + #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x60000000\0" \ "pxefile_addr_r=0x60100000\0" \ @@ -56,12 +63,10 @@ #include -/* Linux fails to load the fdt if it's loaded above 512M on a evb-rk3036 board, - * so limit the fdt reallocation to that */ #define CONFIG_EXTRA_ENV_SETTINGS \ - "fdt_high=0x7fffffff\0" \ "partitions=" PARTS_DEFAULT \ ENV_MEM_LAYOUT_SETTINGS \ + ENV_MEM_LAYOUT_SETTINGS1 \ RKIMG_DET_BOOTDEV \ BOOTENV #endif