mpc83xx: accommodate larger kernel sizes by default

linux mpc83xx_defconfig kernels are getting bigger, accommodate for
their growth by adjusting default load and fdt addresses.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index d9aa60b..4bf05d2 100644 (file)
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -594,7 +594,7 @@
 #define CONFIG_UBOOTPATH       u-boot.bin      /* U-Boot image on TFTP server */
 #define CONFIG_FDTFILE         mpc8313erdb.dtb
 
-#define CONFIG_LOADADDR                500000  /* default location for tftp and bootm */
+#define CONFIG_LOADADDR                800000  /* default location for tftp and bootm */
 #define CONFIG_BOOTDELAY       6       /* -1 disables auto-boot */
 #define CONFIG_BAUDRATE                115200
 
@@ -611,7 +611,7 @@
                "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; "      \
                "protect on " MK_STR(TEXT_BASE) " +$filesize; "         \
                "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0"     \
-       "fdtaddr=400000\0"                                              \
+       "fdtaddr=780000\0"                                              \
        "fdtfile=" MK_STR(CONFIG_FDTFILE) "\0"                          \
        "console=ttyS0\0"                                               \
        "setbootargs=setenv bootargs "                                  \

diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index d5e62e3..84cc9fa 100644 (file)
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -566,7 +566,7 @@
 
 #define CONFIG_BAUDRATE 115200
 
-#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */
+#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
 
 #define CONFIG_BOOTDELAY 6     /* -1 disables auto-boot */
 #undef CONFIG_BOOTARGS         /* the boot command will set bootargs */
@@ -576,7 +576,7 @@
    "consoledev=ttyS0\0"                                                        \
    "ramdiskaddr=1000000\0"                                             \
    "ramdiskfile=ramfs.83xx\0"                                          \
-   "fdtaddr=400000\0"                                                  \
+   "fdtaddr=780000\0"                                                  \
    "fdtfile=mpc8315erdb.dtb\0"                                         \
    "usb_phy_type=utmi\0"                                               \
    ""

diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 907965d..c40d3d3 100644 (file)
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -542,7 +542,7 @@
 #define CONFIG_UBOOTPATH       u-boot.bin      /* U-Boot image on TFTP server */
 #define CONFIG_FDTFILE         mpc832x_rdb.dtb
 
-#define CONFIG_LOADADDR                500000  /* default location for tftp and bootm */
+#define CONFIG_LOADADDR                800000  /* default location for tftp and bootm */
 #define CONFIG_BOOTDELAY       6       /* -1 disables auto-boot */
 #define CONFIG_BAUDRATE                115200
 
@@ -558,7 +558,7 @@
                "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; "      \
                "protect on " MK_STR(TEXT_BASE) " +$filesize; "         \
                "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0"     \
-       "fdtaddr=400000\0"                                              \
+       "fdtaddr=780000\0"                                              \
        "fdtfile=" MK_STR(CONFIG_FDTFILE) "\0"                          \
        "ramdiskaddr=1000000\0"                                         \
        "ramdiskfile=" MK_STR(CONFIG_RAMDISKFILE) "\0"                  \

diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 4e23a11..f16616c 100644 (file)
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -548,7 +548,7 @@
 
 #define CONFIG_BAUDRATE        115200
 
-#define CONFIG_LOADADDR        500000  /* default location for tftp and bootm */
+#define CONFIG_LOADADDR        800000  /* default location for tftp and bootm */
 
 #define CONFIG_BOOTDELAY 6     /* -1 disables auto-boot */
 #undef  CONFIG_BOOTARGS                /* the boot command will set bootargs */
@@ -558,7 +558,7 @@
    "consoledev=ttyS0\0"                                                        \
    "ramdiskaddr=1000000\0"                                             \
    "ramdiskfile=ramfs.83xx\0"                                          \
-   "fdtaddr=400000\0"                                                  \
+   "fdtaddr=780000\0"                                                  \
    "fdtfile=mpc832x_mds.dtb\0"                                         \
    ""
 

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index a8c8a79..1d736f3 100644 (file)
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -700,7 +700,7 @@
 #define CONFIG_GATEWAYIP       192.168.1.1
 #define CONFIG_NETMASK         255.255.255.0
 
-#define CONFIG_LOADADDR                500000  /* default location for tftp and bootm */
+#define CONFIG_LOADADDR                800000  /* default location for tftp and bootm */
 
 #define CONFIG_BOOTDELAY       6       /* -1 disables auto-boot */
 #undef  CONFIG_BOOTARGS                        /* the boot command will set bootargs */
@@ -731,7 +731,7 @@
        "update=protect off fe000000 fe03ffff; "                        \
                "era fe000000 fe03ffff; cp.b 100000 fe000000 ${filesize}\0"     \
        "upd=run load update\0"                                         \
-       "fdtaddr=400000\0"                                              \
+       "fdtaddr=780000\0"                                              \
        "fdtfile=mpc8349emds.dtb\0"                                     \
        ""
 

diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h
index fe6ec48..b072e84 100644 (file)
--- a/include/configs/MPC8360EMDS.h
+++ b/include/configs/MPC8360EMDS.h
@@ -589,7 +589,7 @@
 
 #define CONFIG_BAUDRATE 115200
 
-#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */
+#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
 
 #define CONFIG_BOOTDELAY 6     /* -1 disables auto-boot */
 #undef CONFIG_BOOTARGS         /* the boot command will set bootargs */
@@ -599,7 +599,7 @@
    "consoledev=ttyS0\0"                                                        \
    "ramdiskaddr=1000000\0"                                             \
    "ramdiskfile=ramfs.83xx\0"                                          \
-   "fdtaddr=400000\0"                                                  \
+   "fdtaddr=780000\0"                                                  \
    "fdtfile=mpc836x_mds.dtb\0"                                         \
    ""
 

diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index a2a2aad..a190a50 100644 (file)
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -646,7 +646,7 @@ extern int board_pci_host_broken(void);
 
 #define CONFIG_BAUDRATE 115200
 
-#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */
+#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
 
 #define CONFIG_BOOTDELAY 6     /* -1 disables auto-boot */
 #undef CONFIG_BOOTARGS         /* the boot command will set bootargs */
@@ -656,7 +656,7 @@ extern int board_pci_host_broken(void);
    "consoledev=ttyS0\0"                                                        \
    "ramdiskaddr=1000000\0"                                             \
    "ramdiskfile=ramfs.83xx\0"                                          \
-   "fdtaddr=400000\0"                                                  \
+   "fdtaddr=780000\0"                                                  \
    "fdtfile=mpc8379_mds.dtb\0"                                         \
    ""
 

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index ca89b9b..89fafe7 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -668,7 +668,7 @@
 #define CONFIG_UBOOTPATH       u-boot.bin      /* U-Boot image on TFTP server */
 #define CONFIG_FDTFILE         mpc8379_rdb.dtb
 
-#define CONFIG_LOADADDR                500000  /* default location for tftp and bootm */
+#define CONFIG_LOADADDR                800000  /* default location for tftp and bootm */
 #define CONFIG_BOOTDELAY       6       /* -1 disables auto-boot */
 #define CONFIG_BAUDRATE                115200
 
@@ -684,7 +684,7 @@
                "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; "      \
                "protect on " MK_STR(TEXT_BASE) " +$filesize; "         \
                "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0"     \
-       "fdtaddr=400000\0"                                              \
+       "fdtaddr=780000\0"                                              \
        "fdtfile=" MK_STR(CONFIG_FDTFILE) "\0"                          \
        "ramdiskaddr=1000000\0"                                         \
        "ramdiskfile=" MK_STR(CONFIG_RAMDISKFILE) "\0"                  \

diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 4f2aef0..e961bb3 100644 (file)
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -630,7 +630,7 @@
 #define CONFIG_GATEWAYIP       192.168.1.1
 #define CONFIG_NETMASK         255.255.255.0
 
-#define CONFIG_LOADADDR                500000  /* default location for tftp and bootm */
+#define CONFIG_LOADADDR                800000  /* default location for tftp and bootm */
 
 #define CONFIG_BOOTDELAY       6       /* -1 disables auto-boot */
 #undef  CONFIG_BOOTARGS                        /* the boot command will set bootargs */
@@ -657,7 +657,7 @@
        "update=protect off ff800000 ff83ffff; "                        \
                "era ff800000 ff83ffff; cp.b 100000 ff800000 ${filesize}\0"     \
        "upd=run load update\0"                                         \
-       "fdtaddr=400000\0"                                              \
+       "fdtaddr=780000\0"                                              \
        "fdtfile=sbc8349.dtb\0"                                         \
        ""
 

diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index 35d367d..5304ec9 100644 (file)
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -554,7 +554,7 @@
 #define CONFIG_ROOTPATH                /tftpboot/rootfs
 #define CONFIG_BOOTFILE                uImage
 
-#define CONFIG_LOADADDR                500000  /* def location for tftp and bootm */
+#define CONFIG_LOADADDR                800000  /* def location for tftp and bootm */
 
 #define CONFIG_BOOTDELAY       6       /* -1 disables auto-boot */
 #undef  CONFIG_BOOTARGS                        /* boot command will set bootargs */
@@ -581,7 +581,7 @@
        "update=protect off fff00000 fff3ffff; "                        \
                "era fff00000 fff3ffff; cp.b 100000 fff00000 ${filesize}\0" \
        "upd=run load update\0"                                         \
-       "fdtaddr=400000\0"                                              \
+       "fdtaddr=780000\0"                                              \
        "fdtfile=vme8349.dtb\0"                                         \
        ""