From fb78adbc1584df9eb6cbaf3c2c1493ac1ad4465f Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
Date: Sun, 10 Jan 2021 15:16:32 +0100
Subject: [PATCH] fixup! mpc85xx: add support for HP MSM 460

---
 .../files/arch/powerpc/boot/dts/msm460.dts    | 37 +++++++++++++------
 target/linux/mpc85xx/image/p1020.mk           |  6 ++-
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/msm460.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/msm460.dts
index 23608a90c5..4dc95b6027 100644
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/msm460.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/msm460.dts
@@ -32,24 +32,39 @@
 				#size-cells = <1>;
 
 				partition@0 {
-					reg = <0x0 0xa0000>;
-					label = "uboot";
+					reg = <0x0 0xc0000>;
+					label = "u-boot";
 					read-only;
 				};
 
-				partition@a0000 {
-					reg = <0xa0000 0x20000>;
-					label = "uboot-env0";
+				partition@100000 {
+					reg = <0x100000 0x400000>;
+					label = "bw-kernel";
 				};
 
-				partition@c0000 {
-					reg = <0xc0000 0x40000>;
-					label = "uboot-env1";
+				partition@500000 {
+					reg = <0x500000 0x400000>;
+					label = "kernel";
 				};
 
-				partition@100000 {
-					reg = <0x100000 0xff00000>;
-					label = "ubi";
+				partition@900000 {
+					reg = <0x900000 0x1400000>;
+					label = "bw-slash";
+				};
+
+				partition@1d00000 {
+					reg = <0x1d00000 0x4800000>;
+					label = "slash";
+				};
+
+				partition@6900000 {
+					reg = <0x6900000 0x15E0000>;
+					label = "flash";
+				};
+
+				partition@7ee0000 {
+					reg = <0x7ee0000 0x20000>;
+					label = "pf";
 				};
 			};
 		};
diff --git a/target/linux/mpc85xx/image/p1020.mk b/target/linux/mpc85xx/image/p1020.mk
index 2ffaaf2eb1..12667ff2f2 100644
--- a/target/linux/mpc85xx/image/p1020.mk
+++ b/target/linux/mpc85xx/image/p1020.mk
@@ -28,9 +28,11 @@ TARGET_DEVICES += enterasys_ws-ap3710i
 define Device/hp_msm460
   DEVICE_VENDOR := Hewlett-Packard
   DEVICE_MODEL := MSM460
-  KERNEL = kernel-bin | gzip | fit gzip $(KDIR)/image-$$(DEVICE_DTS).dtb
-  IMAGES := sysupgrade.bin
+  KERNEL = kernel-bin | gzip | uImage gzip
+  IMAGES := ramdisk.bin fdt.bin sysupgrade.bin
+  IMAGE/ramdisk.bin := append-uImage-fakehdr ramdisk | pad-to 256k
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+  IMAGE/fdt.bin := append-dtb
 endef
 TARGET_DEVICES += hp_msm460
 
-- 
2.30.2