diff options
author | Tom Rini <trini@konsulko.com> | 2016-11-02 09:41:20 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-11-02 09:41:20 -0400 |
commit | 7fd117389ec7bbd0ce2fbb98ce47c20f5b8a0cfb (patch) | |
tree | e3cac6c8365b63bfa1e5251eebec7f1bf68ac098 /include/configs/rk3288_common.h | |
parent | d8bdfc80da39211d95f10d24e79f2e867305f71b (diff) | |
parent | 4594ac07847f5c7fe7294ce6c71849fea0a431e0 (diff) | |
download | u-boot-imx-7fd117389ec7bbd0ce2fbb98ce47c20f5b8a0cfb.zip u-boot-imx-7fd117389ec7bbd0ce2fbb98ce47c20f5b8a0cfb.tar.gz u-boot-imx-7fd117389ec7bbd0ce2fbb98ce47c20f5b8a0cfb.tar.bz2 |
Merge git://git.denx.de/u-boot-rockchip
Diffstat (limited to 'include/configs/rk3288_common.h')
-rw-r--r-- | include/configs/rk3288_common.h | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index cf6f355..0868612 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -8,6 +8,7 @@ #define __CONFIG_RK3288_COMMON_H #include <asm/arch/hardware.h> +#include "rockchip-common.h" #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY #define CONFIG_SYS_NO_FLASH @@ -89,11 +90,6 @@ #define CONFIG_G_DNL_VENDOR_NUM 0x2207 #define CONFIG_G_DNL_PRODUCT_NUM 0x320a -/* Enable gpt partition table */ -#define CONFIG_CMD_GPT - -#include <config_distro_defaults.h> - #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x00000000\0" \ "pxefile_addr_r=0x00100000\0" \ @@ -101,24 +97,13 @@ "kernel_addr_r=0x02000000\0" \ "ramdisk_addr_r=0x04000000\0" -#define CONFIG_RANDOM_UUID -#define PARTS_DEFAULT \ - "uuid_disk=${uuid_gpt_disk};" \ - "name=boot,start=8M,size=64M,bootable,uuid=${uuid_gpt_boot};" \ - "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \ - -/* First try to boot from SD (index 0), then eMMC (index 1 */ -#define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 0) \ - func(MMC, mmc, 1) - #include <config_distro_bootcmd.h> -/* Linux fails to load the fdt if it's loaded above 512M on a Rock 2 board, so +/* Linux fails to load the fdt if it's loaded above 256M on a Rock 2 board, so * limit the fdt reallocation to that */ #define CONFIG_EXTRA_ENV_SETTINGS \ - "fdt_high=0x1fffffff\0" \ - "initrd_high=0x1fffffff\0" \ + "fdt_high=0x0fffffff\0" \ + "initrd_high=0x0fffffff\0" \ "partitions=" PARTS_DEFAULT \ ENV_MEM_LAYOUT_SETTINGS \ ROCKCHIP_DEVICE_SETTINGS \ |