MIPS: convert CONFIG_SYS_MIPS_TIMER_FREQ to Kconfig

[platform/kernel/u-boot.git] / include / configs / colibri_imx7.h

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 8a6536e..b8d0dc9 100644 (file)
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -83,11 +83,11 @@
 
 #define MEM_LAYOUT_ENV_SETTINGS \
        "bootm_size=0x10000000\0" \
-       "fdt_addr_r=0x82000000\0" \
-       "kernel_addr_r=0x81000000\0" \
-       "pxefile_addr_r=0x87100000\0" \
-       "ramdisk_addr_r=0x82100000\0" \
-       "scriptaddr=0x87000000\0"
+       "fdt_addr_r=0x88200000\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "pxefile_addr_r=0x88300000\0" \
+       "ramdisk_addr_r=0x88400000\0" \
+       "scriptaddr=0x88280000\0"
 
 #define UBI_BOOTCMD    \
        "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs " \
@@ -130,7 +130,6 @@
        UBOOT_UPDATE \
        "boot_file=zImage\0" \
        "boot_script_dhcp=boot.scr\0" \
-       "bootubipart=ubi\0" \
        "console=ttymxc0\0" \
        "defargs=\0" \
        "fdt_board=eval-v3\0" \