Revert "mpc85xx: tl-wdr4900 simpleImage"
authorChristian Lamparter <chunkeey@gmail.com>
Sat, 13 Apr 2019 16:34:36 +0000 (18:34 +0200)
committerChristian Lamparter <chunkeey@gmail.com>
Sun, 14 Apr 2019 14:40:56 +0000 (16:40 +0200)
This reverts commit 20b1bb8b554f0562e9e2d404fa5cd6e094be6515.

target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
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

index 88075fe..ab4952a 100644 (file)
        model = "TP-Link TL-WDR4900 v1";
        compatible = "tplink,tl-wdr4900-v1";
 
-       cpus {
-               PowerPC,P1010@0 {
-                       bus-frequency = <399999996>;
-                        timebase-frequency = <49999999>;
-                        clock-frequency = <799999992>;
-               };
-       };
-
        chosen {
                bootargs = "console=ttyS0,115200";
 /*
        };
 
        memory {
-               reg = <0x0 0x0 0x0 0x8000000>;
                device_type = "memory";
        };
 
        soc: soc@ffe00000 {
                ranges = <0x0 0x0 0xffe00000 0x100000>;
-               bus-frequency = <399999996>;
 
                spi0: spi@7000 {
                        flash@0 {
                        status = "disabled";
                };
 
-               serial@4500 {
-                       clock-frequency = <399999996>;
-               };
-
                can0: can@1c000 {
                        status = "disabled";
                };
                        status = "disabled";
                };
 
-               pic@40000 {
-                       clock-frequency = <399999996>;
-               };
-
                ptp_clock@b0e00 {
                        compatible = "fsl,etsec-ptp";
                        reg = <0xb0e00 0xb0>;
index f826fe4..140b482 100644 (file)
@@ -1,6 +1,6 @@
 BOARDNAME:=Generic
 FEATURES+=nand
-KERNELNAME:=simpleImage.tl-wdr4900-v1
+KERNELNAME:=dtbImage.tl-wdr4900-v1
 
 define Target/Description
        Build firmware images for generic MPC85xx based boards.
index 66bfcf6..8cc0e90 100644 (file)
@@ -39,8 +39,7 @@ define Device/Default
   PROFILES := Default
   DEVICE_DTS := $(1)
   KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
-  KERNEL_ENTRY := 0x1000000
-#  KERNEL_ENTRY := 0x00000000
+  KERNEL_ENTRY := 0x00000000
   KERNEL_LOADADDR := 0x00000000
   KERNEL := kernel-bin
 endef
@@ -53,7 +52,7 @@ define Device/tl-wdr4900-v1
   TPLINK_HWREV := 1
   TPLINK_FLASHLAYOUT := 16Mppc
   KERNEL_SIZE := 2684k
-  KERNEL_NAME := simpleImage.tl-wdr4900-v1
+  KERNEL_NAME := dtbImage.tl-wdr4900-v1
   KERNEL_INITRAMFS :=
   KERNEL := kernel-bin | uImage none
   KERNEL_ENTRY := 0x1000000
index b988ba7..31272c3 100644 (file)
@@ -17,30 +17,37 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
+@@ -156,6 +156,7 @@ src-plat-$(CONFIG_PPC_PSERIES) += pserie
+ 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-wlib := $(sort $(src-wlib-y))
+ src-plat := $(sort $(src-plat-y))
 @@ -335,7 +336,7 @@ image-$(CONFIG_TQM8555)                    += cuImage.tqm
  image-$(CONFIG_TQM8560)                       += cuImage.tqm8560
  image-$(CONFIG_SBC8548)                       += cuImage.sbc8548
  image-$(CONFIG_KSI8560)                       += cuImage.ksi8560
 -
-+image-$(CONFIG_TL_WDR4900_V1)         += simpleImage.tl-wdr4900-v1
++image-$(CONFIG_TL_WDR4900_V1)         += dtbImage.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
-@@ -294,6 +294,12 @@ ps3)
-     make_space=n
-     pie=
+@@ -335,6 +335,11 @@ treeboot-akebono)
+ treeboot-iss4xx-mpic)
+     platformo="$object/treeboot-iss4xx.o"
      ;;
-+simpleboot-tl-wdr4900-v1|\
 +tl-wdr4900-v1)
-+    platformo="$object/fixed-head.o $object/simpleboot.o"
++    platformo="$object/fixed-head.o $object/tl-wdr4900-v1.o"
 +    link_address='0x1000000'
 +    binary=y
 +    ;;
- ep88xc|ep405|ep8248e)
-     platformo="$object/fixed-head.o $object/$platform.o"
-     binary=y
+ epapr)
+     platformo="$object/pseries-head.o $object/epapr.o $object/epapr-wrapper.o"
+     link_address='0x20000000'
 --- a/arch/powerpc/platforms/85xx/Kconfig
 +++ b/arch/powerpc/platforms/85xx/Kconfig
 @@ -170,6 +170,17 @@ config STX_GP3
@@ -78,7 +85,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  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) += simpleboot.c fixed-head.S 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 \