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 d9aa60bcd1b86938196a00218307c797aebfd5b2..4bf05d2033616fbd3401250b057f6582befbb2f9 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 d5e62e34721f71816bc7455b6c709d8d65fa093b..84cc9fa41ea02ce15e736df16c9b1c7e7b2423ff 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 907965d651ed404925b26eb11ba69e5f3c853742..c40d3d3f4a3e5b8f8594a38fddac726555e5d9c5 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 4e23a1174a43460f6f6cb471b0346d8cf357485c..f16616c0db0c9ffcceb19e801c3b542e05b94320 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 a8c8a798723d8ec43816f7722a7e5bc40f7b0ed8..1d736f32a6d904f40306cfe996b29bf0ce63ff5b 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 fe6ec48ca4a6a5f47765bcc0633e79674abafc46..b072e84473b593c4d53c235403986bd5a9659ff4 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 a2a2aadb52069ce5ef8f8095e8eb3528ee2a9f84..a190a50ed8a898d253757c5fa44c1d4799575ff4 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 ca89b9be40a18c561a396ac728a7f426d50cca5f..89fafe7d23d936c792a23baed3647f3a1e716b14 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 4f2aef0963f7d67a09dc1827a6ee5a52e7e6bdbe..e961bb3929f90d8bdd6fee1def6d881dfc95c2b7 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 35d367da414c68d348aebbaeaadc4bd57a8e388a..5304ec94aefa8904e8db32d440a0b1ba35e206c6 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"                                         \
        ""