Revert "mpc85xx: convert TL-WDR4900 v1 to dtbImage"
authorChristian Lamparter <chunkeey@gmail.com>
Sat, 13 Apr 2019 16:34:44 +0000 (18:34 +0200)
committerChristian Lamparter <chunkeey@gmail.com>
Sun, 14 Apr 2019 14:40:56 +0000 (16:40 +0200)
This reverts commit 300f57a12189607ca285902eb751971ca7387e68.

target/linux/generic/hack-4.14/302-powerpc-Enable-kernel-XZ-compression-option-on-BOOK3.patch [deleted file]
target/linux/generic/hack-4.19/302-powerpc-Enable-kernel-XZ-compression-option-on-BOOK3.patch [deleted file]
target/linux/mpc85xx/files/arch/powerpc/boot/cuboot-tl-wdr4900-v1.c [new file with mode: 0644]
target/linux/mpc85xx/files/arch/powerpc/boot/tl-wdr4900-v1.c [deleted file]
target/linux/mpc85xx/generic/target.mk
target/linux/mpc85xx/image/Makefile
target/linux/mpc85xx/patches-4.14/100-powerpc-85xx-tl-wdr4900-v1-support.patch
target/linux/mpc85xx/patches-4.19/100-powerpc-85xx-tl-wdr4900-v1-support.patch

diff --git a/target/linux/generic/hack-4.14/302-powerpc-Enable-kernel-XZ-compression-option-on-BOOK3.patch b/target/linux/generic/hack-4.14/302-powerpc-Enable-kernel-XZ-compression-option-on-BOOK3.patch
deleted file mode 100644 (file)
index 3897ba9..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From 26064848efbca49c643d1237dc1f8215515d52ee Mon Sep 17 00:00:00 2001
-From: Aaro Koskinen <aaro.koskinen@iki.fi>
-Date: Tue, 19 Jun 2018 23:52:30 +0300
-Subject: [PATCH] powerpc: Enable kernel XZ compression option on BOOK3S_32
-
-Enable kernel XZ compression option on BOOK3S_32. Tested on G4
-PowerBook.
-
-Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
-[mpe: Use one select under the PPC symbol guarded by if PPC_BOOK3S]
-Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-[added PPC_85xx too]
----
-
---- a/arch/powerpc/Kconfig
-+++ b/arch/powerpc/Kconfig
-@@ -199,6 +199,7 @@ config PPC
-       select HAVE_IOREMAP_PROT
-       select HAVE_IRQ_EXIT_ON_IRQ_STACK
-       select HAVE_KERNEL_GZIP
-+      select HAVE_KERNEL_XZ                   if PPC_BOOK3S || PPC_85xx
-       select HAVE_KPROBES
-       select HAVE_KPROBES_ON_FTRACE
-       select HAVE_KRETPROBES
---- a/arch/powerpc/platforms/Kconfig.cputype
-+++ b/arch/powerpc/platforms/Kconfig.cputype
-@@ -75,7 +75,6 @@ config PPC_BOOK3S_64
-       select HAVE_ARCH_TRANSPARENT_HUGEPAGE
-       select ARCH_SUPPORTS_NUMA_BALANCING
-       select IRQ_WORK
--      select HAVE_KERNEL_XZ
- config PPC_BOOK3E_64
-       bool "Embedded processors"
--- 
-2.20.1
-
diff --git a/target/linux/generic/hack-4.19/302-powerpc-Enable-kernel-XZ-compression-option-on-BOOK3.patch b/target/linux/generic/hack-4.19/302-powerpc-Enable-kernel-XZ-compression-option-on-BOOK3.patch
deleted file mode 100644 (file)
index 0c6cb72..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/powerpc/Kconfig
-+++ b/arch/powerpc/Kconfig
-@@ -199,7 +199,7 @@ config PPC
-       select HAVE_IOREMAP_PROT
-       select HAVE_IRQ_EXIT_ON_IRQ_STACK
-       select HAVE_KERNEL_GZIP
--      select HAVE_KERNEL_XZ                   if PPC_BOOK3S
-+      select HAVE_KERNEL_XZ                   if PPC_BOOK3S || PPC_85xx
-       select HAVE_KPROBES
-       select HAVE_KPROBES_ON_FTRACE
-       select HAVE_KRETPROBES
diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/cuboot-tl-wdr4900-v1.c b/target/linux/mpc85xx/files/arch/powerpc/boot/cuboot-tl-wdr4900-v1.c
new file mode 100644 (file)
index 0000000..17459ef
--- /dev/null
@@ -0,0 +1,168 @@
+/*
+ * U-Boot compatibility wrapper for the TP-Link TL-WDR4900 v1 board
+ *
+ * Copyright (c) 2013 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * Based on:
+ *  cuboot-85xx.c
+ *     Author: Scott Wood <scottwood@freescale.com>
+ *     Copyright (c) 2007 Freescale Semiconductor, Inc.
+ *
+ *  simpleboot.c
+ *     Authors: Scott Wood <scottwood@freescale.com>
+ *              Grant Likely <grant.likely@secretlab.ca>
+ *     Copyright (c) 2007 Freescale Semiconductor, Inc.
+ *     Copyright (c) 2008 Secret Lab Technologies Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include "ops.h"
+#include "types.h"
+#include "io.h"
+#include "stdio.h"
+#include <libfdt.h>
+
+BSS_STACK(4*1024);
+
+static unsigned long bus_freq;
+static unsigned long int_freq;
+static u64 mem_size;
+static unsigned char enetaddr[6];
+
+static void process_boot_dtb(void *boot_dtb)
+{
+       const u32 *na, *ns, *reg, *val32;
+       const char *path;
+       u64 memsize64;
+       int node, size, i;
+
+       /* Make sure FDT blob is sane */
+       if (fdt_check_header(boot_dtb) != 0)
+               fatal("Invalid device tree blob\n");
+
+       /* Find the #address-cells and #size-cells properties */
+       node = fdt_path_offset(boot_dtb, "/");
+       if (node < 0)
+               fatal("Cannot find root node\n");
+       na = fdt_getprop(boot_dtb, node, "#address-cells", &size);
+       if (!na || (size != 4))
+               fatal("Cannot find #address-cells property");
+
+       ns = fdt_getprop(boot_dtb, node, "#size-cells", &size);
+       if (!ns || (size != 4))
+               fatal("Cannot find #size-cells property");
+
+       /* Find the memory range */
+       node = fdt_node_offset_by_prop_value(boot_dtb, -1, "device_type",
+                                            "memory", sizeof("memory"));
+       if (node < 0)
+               fatal("Cannot find memory node\n");
+       reg = fdt_getprop(boot_dtb, node, "reg", &size);
+       if (size < (*na+*ns) * sizeof(u32))
+               fatal("cannot get memory range\n");
+
+       /* Only interested in memory based at 0 */
+       for (i = 0; i < *na; i++)
+               if (*reg++ != 0)
+                       fatal("Memory range is not based at address 0\n");
+
+       /* get the memsize and trucate it to under 4G on 32 bit machines */
+       memsize64 = 0;
+       for (i = 0; i < *ns; i++)
+               memsize64 = (memsize64 << 32) | *reg++;
+       if (sizeof(void *) == 4 && memsize64 >= 0x100000000ULL)
+               memsize64 = 0xffffffff;
+
+       mem_size = memsize64;
+
+       /* get clock frequencies */
+       node = fdt_node_offset_by_prop_value(boot_dtb, -1, "device_type",
+                                            "cpu", sizeof("cpu"));
+       if (!node)
+               fatal("Cannot find cpu node\n");
+
+       val32 = fdt_getprop(boot_dtb, node, "clock-frequency", &size);
+       if (!val32 || (size != 4))
+               fatal("Cannot get clock frequency");
+
+       int_freq = *val32;
+
+       val32 = fdt_getprop(boot_dtb, node, "bus-frequency", &size);
+       if (!val32 || (size != 4))
+               fatal("Cannot get bus frequency");
+
+       bus_freq = *val32;
+
+       path = fdt_get_alias(boot_dtb, "ethernet0");
+       if (path) {
+               const void *p;
+
+               node = fdt_path_offset(boot_dtb, path);
+               if (node < 0)
+                       fatal("Cannot find ethernet0 node");
+
+               p = fdt_getprop(boot_dtb, node, "mac-address", &size);
+               if (!p || (size < 6)) {
+                       printf("no mac-address property, finding local\n\r");
+                       p = fdt_getprop(boot_dtb, node, "local-mac-address", &size);
+               }
+
+               if (!p || (size < 6))
+                       fatal("cannot get MAC addres");
+
+               memcpy(enetaddr, p, sizeof(enetaddr));
+       }
+}
+
+static void platform_fixups(void)
+{
+       void *soc, *mpic;
+
+       dt_fixup_memory(0, mem_size);
+
+       dt_fixup_mac_address_by_alias("ethernet0", enetaddr);
+       dt_fixup_cpu_clocks(int_freq, bus_freq / 8, bus_freq);
+
+       /* Unfortunately, the specific model number is encoded in the
+        * soc node name in existing dts files -- once that is fixed,
+        * this can do a simple path lookup.
+        */
+       soc = find_node_by_devtype(NULL, "soc");
+       if (soc) {
+               void *serial = NULL;
+
+               setprop(soc, "bus-frequency", &bus_freq, sizeof(bus_freq));
+
+               while ((serial = find_node_by_devtype(serial, "serial"))) {
+                       if (get_parent(serial) != soc)
+                               continue;
+
+                       setprop(serial, "clock-frequency", &bus_freq,
+                               sizeof(bus_freq));
+               }
+       }
+
+       mpic = find_node_by_compatible(NULL, "fsl,mpic");
+       if (mpic)
+               setprop(mpic, "clock-frequency", &bus_freq, sizeof(bus_freq));
+}
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                   unsigned long r6, unsigned long r7)
+{
+       mem_size = 64 * 1024 * 1024;
+
+       simple_alloc_init(_end, mem_size - (u32)_end - 1024*1024, 32, 64);
+
+       fdt_init(_dtb_start);
+       serial_console_init();
+
+       printf("\n\r-- TL-WDR4900 v1 boot wrapper --\n\r");
+
+       process_boot_dtb((void *) r3);
+
+       platform_ops.fixups = platform_fixups;
+}
diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/tl-wdr4900-v1.c b/target/linux/mpc85xx/files/arch/powerpc/boot/tl-wdr4900-v1.c
deleted file mode 100644 (file)
index 17459ef..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * U-Boot compatibility wrapper for the TP-Link TL-WDR4900 v1 board
- *
- * Copyright (c) 2013 Gabor Juhos <juhosg@openwrt.org>
- *
- * Based on:
- *  cuboot-85xx.c
- *     Author: Scott Wood <scottwood@freescale.com>
- *     Copyright (c) 2007 Freescale Semiconductor, Inc.
- *
- *  simpleboot.c
- *     Authors: Scott Wood <scottwood@freescale.com>
- *              Grant Likely <grant.likely@secretlab.ca>
- *     Copyright (c) 2007 Freescale Semiconductor, Inc.
- *     Copyright (c) 2008 Secret Lab Technologies Ltd.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- */
-
-#include "ops.h"
-#include "types.h"
-#include "io.h"
-#include "stdio.h"
-#include <libfdt.h>
-
-BSS_STACK(4*1024);
-
-static unsigned long bus_freq;
-static unsigned long int_freq;
-static u64 mem_size;
-static unsigned char enetaddr[6];
-
-static void process_boot_dtb(void *boot_dtb)
-{
-       const u32 *na, *ns, *reg, *val32;
-       const char *path;
-       u64 memsize64;
-       int node, size, i;
-
-       /* Make sure FDT blob is sane */
-       if (fdt_check_header(boot_dtb) != 0)
-               fatal("Invalid device tree blob\n");
-
-       /* Find the #address-cells and #size-cells properties */
-       node = fdt_path_offset(boot_dtb, "/");
-       if (node < 0)
-               fatal("Cannot find root node\n");
-       na = fdt_getprop(boot_dtb, node, "#address-cells", &size);
-       if (!na || (size != 4))
-               fatal("Cannot find #address-cells property");
-
-       ns = fdt_getprop(boot_dtb, node, "#size-cells", &size);
-       if (!ns || (size != 4))
-               fatal("Cannot find #size-cells property");
-
-       /* Find the memory range */
-       node = fdt_node_offset_by_prop_value(boot_dtb, -1, "device_type",
-                                            "memory", sizeof("memory"));
-       if (node < 0)
-               fatal("Cannot find memory node\n");
-       reg = fdt_getprop(boot_dtb, node, "reg", &size);
-       if (size < (*na+*ns) * sizeof(u32))
-               fatal("cannot get memory range\n");
-
-       /* Only interested in memory based at 0 */
-       for (i = 0; i < *na; i++)
-               if (*reg++ != 0)
-                       fatal("Memory range is not based at address 0\n");
-
-       /* get the memsize and trucate it to under 4G on 32 bit machines */
-       memsize64 = 0;
-       for (i = 0; i < *ns; i++)
-               memsize64 = (memsize64 << 32) | *reg++;
-       if (sizeof(void *) == 4 && memsize64 >= 0x100000000ULL)
-               memsize64 = 0xffffffff;
-
-       mem_size = memsize64;
-
-       /* get clock frequencies */
-       node = fdt_node_offset_by_prop_value(boot_dtb, -1, "device_type",
-                                            "cpu", sizeof("cpu"));
-       if (!node)
-               fatal("Cannot find cpu node\n");
-
-       val32 = fdt_getprop(boot_dtb, node, "clock-frequency", &size);
-       if (!val32 || (size != 4))
-               fatal("Cannot get clock frequency");
-
-       int_freq = *val32;
-
-       val32 = fdt_getprop(boot_dtb, node, "bus-frequency", &size);
-       if (!val32 || (size != 4))
-               fatal("Cannot get bus frequency");
-
-       bus_freq = *val32;
-
-       path = fdt_get_alias(boot_dtb, "ethernet0");
-       if (path) {
-               const void *p;
-
-               node = fdt_path_offset(boot_dtb, path);
-               if (node < 0)
-                       fatal("Cannot find ethernet0 node");
-
-               p = fdt_getprop(boot_dtb, node, "mac-address", &size);
-               if (!p || (size < 6)) {
-                       printf("no mac-address property, finding local\n\r");
-                       p = fdt_getprop(boot_dtb, node, "local-mac-address", &size);
-               }
-
-               if (!p || (size < 6))
-                       fatal("cannot get MAC addres");
-
-               memcpy(enetaddr, p, sizeof(enetaddr));
-       }
-}
-
-static void platform_fixups(void)
-{
-       void *soc, *mpic;
-
-       dt_fixup_memory(0, mem_size);
-
-       dt_fixup_mac_address_by_alias("ethernet0", enetaddr);
-       dt_fixup_cpu_clocks(int_freq, bus_freq / 8, bus_freq);
-
-       /* Unfortunately, the specific model number is encoded in the
-        * soc node name in existing dts files -- once that is fixed,
-        * this can do a simple path lookup.
-        */
-       soc = find_node_by_devtype(NULL, "soc");
-       if (soc) {
-               void *serial = NULL;
-
-               setprop(soc, "bus-frequency", &bus_freq, sizeof(bus_freq));
-
-               while ((serial = find_node_by_devtype(serial, "serial"))) {
-                       if (get_parent(serial) != soc)
-                               continue;
-
-                       setprop(serial, "clock-frequency", &bus_freq,
-                               sizeof(bus_freq));
-               }
-       }
-
-       mpic = find_node_by_compatible(NULL, "fsl,mpic");
-       if (mpic)
-               setprop(mpic, "clock-frequency", &bus_freq, sizeof(bus_freq));
-}
-
-void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
-                   unsigned long r6, unsigned long r7)
-{
-       mem_size = 64 * 1024 * 1024;
-
-       simple_alloc_init(_end, mem_size - (u32)_end - 1024*1024, 32, 64);
-
-       fdt_init(_dtb_start);
-       serial_console_init();
-
-       printf("\n\r-- TL-WDR4900 v1 boot wrapper --\n\r");
-
-       process_boot_dtb((void *) r3);
-
-       platform_ops.fixups = platform_fixups;
-}
index 140b482..82e2b63 100644 (file)
@@ -1,6 +1,6 @@
 BOARDNAME:=Generic
 FEATURES+=nand
-KERNELNAME:=dtbImage.tl-wdr4900-v1
+KERNELNAME:=cuImage.tl-wdr4900-v1
 
 define Target/Description
        Build firmware images for generic MPC85xx based boards.
index 8cc0e90..d2c3ae1 100644 (file)
@@ -51,16 +51,11 @@ define Device/tl-wdr4900-v1
   TPLINK_HWID := 0x49000001
   TPLINK_HWREV := 1
   TPLINK_FLASHLAYOUT := 16Mppc
-  KERNEL_SIZE := 2684k
-  KERNEL_NAME := dtbImage.tl-wdr4900-v1
+  KERNEL_NAME := cuImage.tl-wdr4900-v1
   KERNEL_INITRAMFS :=
-  KERNEL := kernel-bin | uImage none
-  KERNEL_ENTRY := 0x1000000
-  KERNEL_LOADADDR := 0x1000000
   SUPPORTED_DEVICES:=tl-wdr4900-v1 tplink,tl-wdr4900-v1
-  ARTIFACTS := fdt.bin
-  ARTIFACT/fdt.bin := append-dtb
   IMAGES := fdt.bin factory.bin sysupgrade.bin
+  IMAGE/fdt.bin := append-dtb
   IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade | append-metadata
   IMAGE/factory.bin := append-rootfs | mktplinkfw factory
 endef
index 31272c3..0fbb16f 100644 (file)
@@ -11,7 +11,7 @@ the Freescale P1014 SoC.
 Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 ---
  arch/powerpc/boot/Makefile                  |   3 +
- arch/powerpc/boot/wrapper                   |   5 +
+ arch/powerpc/boot/wrapper                   |   4 +
  arch/powerpc/platforms/85xx/Kconfig         |  11 ++
  arch/powerpc/platforms/85xx/Makefile        |   1 +
 
@@ -21,7 +21,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  src-plat-$(CONFIG_PPC_POWERNV) += pseries-head.S
  src-plat-$(CONFIG_PPC_IBM_CELL_BLADE) += pseries-head.S
  src-plat-$(CONFIG_MVME7100) += motload-head.S mvme7100.c
-+src-plat-$(CONFIG_TL_WDR4900_V1) += tl-wdr4900-v1.c
++src-plat-$(CONFIG_TL_WDR4900_V1) += cuboot-tl-wdr4900-v1.c
  
  src-wlib := $(sort $(src-wlib-y))
  src-plat := $(sort $(src-plat-y))
@@ -30,24 +30,23 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  image-$(CONFIG_SBC8548)                       += cuImage.sbc8548
  image-$(CONFIG_KSI8560)                       += cuImage.ksi8560
 -
-+image-$(CONFIG_TL_WDR4900_V1)         += dtbImage.tl-wdr4900-v1
++image-$(CONFIG_TL_WDR4900_V1)         += cuImage.tl-wdr4900-v1
  # Board ports in arch/powerpc/platform/86xx/Kconfig
  image-$(CONFIG_MVME7100)                += dtbImage.mvme7100
  
 --- a/arch/powerpc/boot/wrapper
 +++ b/arch/powerpc/boot/wrapper
-@@ -335,6 +335,11 @@ treeboot-akebono)
treeboot-iss4xx-mpic)
-     platformo="$object/treeboot-iss4xx.o"
-     ;;
-+tl-wdr4900-v1)
-+    platformo="$object/fixed-head.o $object/tl-wdr4900-v1.o"
+@@ -277,6 +277,10 @@ cuboot*)
    *-mpc85*|*-tqm85*|*-sbc85*)
+         platformo=$object/cuboot-85xx.o
+         ;;
++    *-tl-wdr4900-v1)
++        platformo=$object/cuboot-tl-wdr4900-v1.o
 +    link_address='0x1000000'
-+    binary=y
-+    ;;
- epapr)
-     platformo="$object/pseries-head.o $object/epapr.o $object/epapr-wrapper.o"
-     link_address='0x20000000'
++        ;;
+     *-amigaone)
+         link_address='0x800000'
+         ;;
 --- a/arch/powerpc/platforms/85xx/Kconfig
 +++ b/arch/powerpc/platforms/85xx/Kconfig
 @@ -170,6 +170,17 @@ config STX_GP3
@@ -78,14 +77,3 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  obj-$(CONFIG_SBC8548)     += sbc8548.o
  obj-$(CONFIG_PPA8548)     += ppa8548.o
  obj-$(CONFIG_SOCRATES)    += socrates.o socrates_fpga_pic.o
---- a/arch/powerpc/boot/Makefile       2019-02-06 15:23:52.214954826 +0100
-+++ b/arch/powerpc/boot/Makefile       2019-02-06 15:13:40.633621126 +0100
-@@ -144,7 +144,7 @@ src-plat-$(CONFIG_PPC_8xx) += cuboot-8xx
- src-plat-$(CONFIG_PPC_MPC52xx) += cuboot-52xx.c
- src-plat-$(CONFIG_PPC_82xx) += cuboot-pq2.c fixed-head.S ep8248e.c cuboot-824x.c
- src-plat-$(CONFIG_PPC_83xx) += cuboot-83xx.c fixed-head.S redboot-83xx.c
--src-plat-$(CONFIG_FSL_SOC_BOOKE) += cuboot-85xx.c cuboot-85xx-cpm2.c
-+src-plat-$(CONFIG_FSL_SOC_BOOKE) += fixed-head.S cuboot-85xx.c cuboot-85xx-cpm2.c
- src-plat-$(CONFIG_EMBEDDED6xx) += cuboot-pq2.c cuboot-mpc7448hpc2.c \
-                                       cuboot-c2k.c gamecube-head.S \
-                                       gamecube.c wii-head.S wii.c holly.c \
index ff44d93..6d76ebc 100644 (file)
@@ -11,7 +11,7 @@ the Freescale P1014 SoC.
 Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 ---
  arch/powerpc/boot/Makefile                  |   3 +
- arch/powerpc/boot/wrapper                   |   5 +
+ arch/powerpc/boot/wrapper                   |   4 +
  arch/powerpc/platforms/85xx/Kconfig         |  11 ++
  arch/powerpc/platforms/85xx/Makefile        |   1 +
 
@@ -21,7 +21,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  src-plat-$(CONFIG_PPC_POWERNV) += pseries-head.S
  src-plat-$(CONFIG_PPC_IBM_CELL_BLADE) += pseries-head.S
  src-plat-$(CONFIG_MVME7100) += motload-head.S mvme7100.c
-+src-plat-$(CONFIG_TL_WDR4900_V1) += tl-wdr4900-v1.c
++src-plat-$(CONFIG_TL_WDR4900_V1) += cuboot-tl-wdr4900-v1.c
  
  src-wlib := $(sort $(src-wlib-y))
  src-plat := $(sort $(src-plat-y))
@@ -30,24 +30,23 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  image-$(CONFIG_SBC8548)                       += cuImage.sbc8548
  image-$(CONFIG_KSI8560)                       += cuImage.ksi8560
 -
-+image-$(CONFIG_TL_WDR4900_V1)         += dtbImage.tl-wdr4900-v1
++image-$(CONFIG_TL_WDR4900_V1)         += cuImage.tl-wdr4900-v1
  # Board ports in arch/powerpc/platform/86xx/Kconfig
  image-$(CONFIG_MVME7100)                += dtbImage.mvme7100
  
 --- a/arch/powerpc/boot/wrapper
 +++ b/arch/powerpc/boot/wrapper
-@@ -335,6 +335,11 @@ treeboot-akebono)
treeboot-iss4xx-mpic)
-     platformo="$object/treeboot-iss4xx.o"
-     ;;
-+tl-wdr4900-v1)
-+    platformo="$object/fixed-head.o $object/tl-wdr4900-v1.o"
+@@ -277,6 +277,10 @@ cuboot*)
    *-mpc85*|*-tqm85*|*-sbc85*)
+         platformo=$object/cuboot-85xx.o
+         ;;
++    *-tl-wdr4900-v1)
++        platformo=$object/cuboot-tl-wdr4900-v1.o
 +    link_address='0x1000000'
-+    binary=y
-+    ;;
- epapr)
-     platformo="$object/pseries-head.o $object/epapr.o $object/epapr-wrapper.o"
-     link_address='0x20000000'
++        ;;
+     *-amigaone)
+         link_address='0x800000'
+         ;;
 --- a/arch/powerpc/platforms/85xx/Kconfig
 +++ b/arch/powerpc/platforms/85xx/Kconfig
 @@ -170,6 +170,18 @@ config STX_GP3
@@ -79,14 +78,3 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  obj-$(CONFIG_SBC8548)     += sbc8548.o
  obj-$(CONFIG_PPA8548)     += ppa8548.o
  obj-$(CONFIG_SOCRATES)    += socrates.o socrates_fpga_pic.o
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -144,7 +144,7 @@ src-plat-$(CONFIG_PPC_8xx) += cuboot-8xx
- src-plat-$(CONFIG_PPC_MPC52xx) += cuboot-52xx.c
- src-plat-$(CONFIG_PPC_82xx) += cuboot-pq2.c fixed-head.S ep8248e.c cuboot-824x.c
- src-plat-$(CONFIG_PPC_83xx) += cuboot-83xx.c fixed-head.S redboot-83xx.c
--src-plat-$(CONFIG_FSL_SOC_BOOKE) += cuboot-85xx.c cuboot-85xx-cpm2.c
-+src-plat-$(CONFIG_FSL_SOC_BOOKE) += fixed-head.S cuboot-85xx.c cuboot-85xx-cpm2.c
- src-plat-$(CONFIG_EMBEDDED6xx) += cuboot-pq2.c cuboot-mpc7448hpc2.c \
-                                       cuboot-c2k.c gamecube-head.S \
-                                       gamecube.c wii-head.S wii.c holly.c \