Revert "msm460"
authorDavid Bauer <[email protected]>
Thu, 2 Mar 2023 15:56:36 +0000 (16:56 +0100)
committerDavid Bauer <[email protected]>
Mon, 3 Apr 2023 01:14:58 +0000 (03:14 +0200)
This reverts commit 1cbaf696a76a08f0569b7332c7dc80a5eaa95f7f.

target/linux/mpc85xx/base-files/etc/board.d/01_leds
target/linux/mpc85xx/base-files/etc/board.d/02_network
target/linux/mpc85xx/base-files/lib/upgrade/platform.sh
target/linux/mpc85xx/files/arch/powerpc/boot/dts/msm460.dts [deleted file]
target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/msm460.c [deleted file]
target/linux/mpc85xx/image/p1020.mk
target/linux/mpc85xx/p1020/config-default
target/linux/mpc85xx/patches-5.10/108-powerpc-85xx-hpe-msm-support.patch [deleted file]
target/linux/mpc85xx/patches-5.15/108-powerpc-85xx-hpe-msm-support.patch [deleted file]

index 38ce10c906c377cce55c3c36c27a61db5902c4bc..391c909e4cd54c64e099d1cbb4d974e59ca899d2 100644 (file)
@@ -12,9 +12,6 @@ extreme-networks,ws-ap3825i)
        ucidef_set_led_netdev "lan1" "LAN1" "green:lan1" "eth1"
        ucidef_set_led_netdev "lan2" "LAN2" "green:lan2" "eth0"
        ;;
-hpe,msm460)
-       ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth0"
-       ;;
 esac
 
 board_config_flush
index 041e415052424f038531f63556d0187c70f40aa7..77e208c7faad60bbbbb2ab016f58839d005b4a97 100644 (file)
@@ -12,9 +12,6 @@ case "$board" in
 aerohive,hiveap-330)
        ucidef_set_interfaces_lan_wan "eth1" "eth0"
        ;;
-hpe,msm460)
-       ucidef_set_interface_lan "eth0"
-       ;;      
 ocedo,panda)
        ucidef_set_interface_wan "eth1"
        ucidef_add_switch "switch0" \
index 5d111676ae753ec0cf72c636978e436c6259f658..226b40a90623e8f3b6b6a59102ab5b0b413dcff3 100755 (executable)
@@ -13,7 +13,6 @@ platform_do_upgrade() {
        local board=$(board_name)
 
        case "$board" in
-       hpe,msm460|\
        ocedo,panda|\
        sophos,red-15w-rev1|\
        watchguard,firebox-t10)
diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/msm460.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/msm460.dts
deleted file mode 100644 (file)
index 35deb1e..0000000
+++ /dev/null
@@ -1,173 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later or MIT
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/gpio/gpio.h>
-
-/include/ "fsl/p1020si-pre.dtsi"
-/ {
-       model = "Hewlett-Packard MSM460";
-       compatible = "hpe,msm460";
-
-       aliases {
-               led-boot = &system_green;
-               led-failsafe = &system_green;
-               led-running = &system_green;
-               led-upgrade = &system_green;
-       };
-
-       chosen {
-               /* Needed for initramfs */
-               bootargs-override = "console=ttyS0,115200 ubi.mtd=3,2048";
-       };
-
-       memory {
-               device_type = "memory";
-       };
-
-       lbc: localbus@ffe05000 {
-               reg = <0 0xffe05000 0 0x1000>;
-               ranges = <0x0 0x0 0x0 0xec000000 0x04000000
-                         0x1 0x0 0x0 0xff800000 0x00040000
-                         0x2 0x0 0x0 0xffa00000 0x00020000
-                         0x3 0x0 0x0 0xffb00000 0x00020000>;
-
-               nand@1,0 {
-                       compatible = "fsl,p1020-fcm-nand", "fsl,elbc-fcm-nand";
-                       reg = <0x1 0x0 0x40000>;
-
-                       partitions {
-                               compatible = "fixed-partitions";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partition@0 {
-                                       reg = <0x0 0x100000>;
-                                       label = "uboot";
-                               };
-
-                               partition@a0000 {
-                                       reg = <0x100000 0x60000>;
-                                       label = "uboot-env0";
-                               };
-
-                               partition@c0000 {
-                                       reg = <0x160000 0x60000>;
-                                       label = "uboot-env1";
-                               };
-
-                               partition@100000 {
-                                       reg = <0x1c0000 0x4800000>;
-                                       label = "ubi";
-                               };
-                       };
-               };
-       };
-
-       soc: soc@ffe00000 {
-               ranges = <0x0 0x0 0xffe00000 0x100000>;
-
-               i2c@3000 {
-                       status = "disabled";
-               };
-
-               gpio0: gpio-controller@fc00 {
-               };
-
-               mdio@24000 {
-                       phy0: ethernet-phy@0 {
-                               reg = <0x0>;
-                               reset-gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
-                               reset-assert-us = <10000>;
-                               reset-deassert-us = <10000>;
-                       };
-               };
-
-               enet0: ethernet@b0000 {
-                       phy-connection-type = "rgmii-id";
-                       phy-handle = <&phy0>;
-               };
-
-               enet1: ethernet@b1000 {
-                       status = "disabled";
-               };
-
-               enet2: ethernet@b2000 {
-                       status = "disabled";
-               };
-
-               usb@22000 {
-                       status = "disabled";
-               };
-
-               usb@23000 {
-                       status = "disabled";
-               };
-       };
-
-       pci0: pcie@ffe09000 {
-               ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000
-                         0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>;
-               reg = <0 0xffe09000 0 0x1000>;
-               pcie@0 {
-                       ranges = <0x2000000 0x0 0xa0000000
-                                 0x2000000 0x0 0xa0000000
-                                 0x0 0x20000000
-
-                                 0x1000000 0x0 0x0
-                                 0x1000000 0x0 0x0
-                                 0x0 0x100000>;
-               };
-       };
-
-       pci1: pcie@ffe0a000 {
-               reg = <0 0xffe0a000 0 0x1000>;
-               ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000
-                         0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>;
-               pcie@0 {
-                       ranges = <0x2000000 0x0 0x80000000
-                                 0x2000000 0x0 0x80000000
-                                 0x0 0x20000000
-
-                                 0x1000000 0x0 0x0
-                                 0x1000000 0x0 0x0
-                                 0x0 0x100000>;
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               system_green: power {
-                       gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
-                       label = "green:power";
-                       default-state = "on";
-               };
-
-               lan {
-                       gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
-                       label = "green:lan";
-               };
-
-               radio1 {
-                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
-                       label = "green:radio1";
-                       linux,default-trigger = "phy1tpt";
-               };
-
-               radio2 {
-                       gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
-                       label = "green:radio2";
-               };
-       };
-
-       buttons {
-               compatible = "gpio-keys";
-
-               reset {
-                       label = "reset-btn";
-                       gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;
-                       linux,code = <KEY_RESTART>;
-               };
-       };
-};
-/include/ "fsl/p1020si-post.dtsi"
diff --git a/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/msm460.c b/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/msm460.c
deleted file mode 100644 (file)
index a4f547d..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-/*
- * HPE MSM460 Board Setup
- *
- * Copyright (C) 2022 David Bauer <[email protected]>
- *
- * Based on:
- *   mpc85xx_rdb.c:
- *      MPC85xx RDB Board Setup
- *      Copyright 2013 Freescale Semiconductor Inc.
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- */
-
-#include <linux/stddef.h>
-#include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/of_platform.h>
-
-#include <asm/time.h>
-#include <asm/machdep.h>
-#include <asm/pci-bridge.h>
-#include <mm/mmu_decl.h>
-#include <asm/prom.h>
-#include <asm/udbg.h>
-#include <asm/mpic.h>
-
-#include <sysdev/fsl_soc.h>
-#include <sysdev/fsl_pci.h>
-#include "smp.h"
-
-#include "mpc85xx.h"
-
-void __init msm_pic_init(void)
-{
-       struct mpic *mpic;
-
-       mpic = mpic_alloc(NULL, 0,
-         MPIC_BIG_ENDIAN |
-         MPIC_SINGLE_DEST_CPU,
-         0, 256, " OpenPIC  ");
-
-       BUG_ON(mpic == NULL);
-       mpic_init(mpic);
-}
-
-/*
- * Setup the architecture
- */
-static void __init msm_setup_arch(void)
-{
-       if (ppc_md.progress)
-               ppc_md.progress("msm_setup_arch()", 0);
-
-       mpc85xx_smp_init();
-
-       fsl_pci_assign_primary();
-
-       pr_info("MSM460 board from HPE\n");
-}
-
-machine_arch_initcall(msm, mpc85xx_common_publish_devices);
-
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init msm_probe(void)
-{
-       if (of_machine_is_compatible("hpe,msm460"))
-               return 1;
-       return 0;
-}
-
-define_machine(msm) {
-       .name                   = "P1020 RDB",
-       .probe                  = msm_probe,
-       .setup_arch             = msm_setup_arch,
-       .init_IRQ               = msm_pic_init,
-#ifdef CONFIG_PCI
-       .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
-       .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
-#endif
-       .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
-       .progress               = udbg_progress,
-};
index ca55f065be1c448664f7817bab032adbbcb8ab60..1f17de3f55f749ab69da70a32c55420f032edeff 100644 (file)
@@ -82,15 +82,6 @@ define Device/extreme-networks_ws-ap3825i
 endef
 TARGET_DEVICES += extreme-networks_ws-ap3825i
 
-define Device/hpe_msm460
-  DEVICE_VENDOR := Hewlett-Packard
-  DEVICE_MODEL := MSM460
-  KERNEL = kernel-bin | lzma | fit lzma $(KDIR)/image-$$(DEVICE_DTS).dtb
-  IMAGES := sysupgrade.bin
-  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
-endef
-TARGET_DEVICES += hpe_msm460
-
 define Device/ocedo_panda
   DEVICE_VENDOR := OCEDO
   DEVICE_MODEL := Panda
@@ -104,3 +95,4 @@ define Device/ocedo_panda
   IMAGE/fdt.bin := append-dtb
 endef
 TARGET_DEVICES += ocedo_panda
+
index d1c053258225e7058bb20bafa62702a400c05306..573ff362f956a5aea747591a1a0a8a1339c443c0 100644 (file)
@@ -12,7 +12,6 @@ CONFIG_GPIO_74X164=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
 CONFIG_HIVEAP_330=y
 CONFIG_PANDA=y
-CONFIG_MSM460=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_LEDS_LP5521=y
 CONFIG_LEDS_LP55XX_COMMON=y
diff --git a/target/linux/mpc85xx/patches-5.10/108-powerpc-85xx-hpe-msm-support.patch b/target/linux/mpc85xx/patches-5.10/108-powerpc-85xx-hpe-msm-support.patch
deleted file mode 100644 (file)
index 9f66daf..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/arch/powerpc/platforms/85xx/Kconfig
-+++ b/arch/powerpc/platforms/85xx/Kconfig
-@@ -92,6 +92,17 @@ config WS_AP3825I
-         This board is a Concurrent Dual-Band wireless access point with a
-         Freescale P1020 SoC.
-+config MSM460
-+      bool "HPE MSM460"
-+      select DEFAULT_UIMAGE
-+      select ARCH_REQUIRE_GPIOLIB
-+      select GPIO_MPC8XXX
-+      help
-+        This option enables support for the HPE MSM460 board.
-+
-+        This board is a Concurrent Dual-Band wireless access point with a
-+        Freescale P1020 SoC.
-+
- config MPC8540_ADS
-       bool "Freescale MPC8540 ADS"
-       select DEFAULT_UIMAGE
---- a/arch/powerpc/platforms/85xx/Makefile
-+++ b/arch/powerpc/platforms/85xx/Makefile
-@@ -28,6 +28,7 @@ obj-$(CONFIG_PANDA)       += panda.o
- obj-$(CONFIG_TWR_P102x)   += twr_p102x.o
- obj-$(CONFIG_WS_AP3710I)  += ws-ap3710i.o
- obj-$(CONFIG_WS_AP3825I)  += ws-ap3825i.o
-+obj-$(CONFIG_MSM460)  += msm460.o
- obj-$(CONFIG_CORENET_GENERIC)   += corenet_generic.o
- obj-$(CONFIG_FB_FSL_DIU)      += t1042rdb_diu.o
- obj-$(CONFIG_RED_15W_REV1)    += red15w_rev1.o
diff --git a/target/linux/mpc85xx/patches-5.15/108-powerpc-85xx-hpe-msm-support.patch b/target/linux/mpc85xx/patches-5.15/108-powerpc-85xx-hpe-msm-support.patch
deleted file mode 100644 (file)
index e6f67f4..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/arch/powerpc/platforms/85xx/Kconfig
-+++ b/arch/powerpc/platforms/85xx/Kconfig
-@@ -71,6 +71,17 @@ config PANDA
-         This board is a Concurrent Dual-Band wireless access point with a
-         Freescale P1020 SoC.
-+config MSM460
-+      bool "HPE MSM460"
-+      select DEFAULT_UIMAGE
-+      select ARCH_REQUIRE_GPIOLIB
-+      select GPIO_MPC8XXX
-+      help
-+        This option enables support for the HPE MSM460 board.
-+
-+        This board is a Concurrent Dual-Band wireless access point with a
-+        Freescale P1020 SoC.
-+
- config MPC8540_ADS
-       bool "Freescale MPC8540 ADS"
-       select DEFAULT_UIMAGE
---- a/arch/powerpc/platforms/85xx/Makefile
-+++ b/arch/powerpc/platforms/85xx/Makefile
-@@ -26,6 +26,7 @@ obj-$(CONFIG_P1022_RDK)   += p1022_rdk.o
- obj-$(CONFIG_P1023_RDB)   += p1023_rdb.o
- obj-$(CONFIG_PANDA)       += panda.o
- obj-$(CONFIG_TWR_P102x)   += twr_p102x.o
-+obj-$(CONFIG_MSM460)  += msm460.o
- obj-$(CONFIG_CORENET_GENERIC)   += corenet_generic.o
- obj-$(CONFIG_FB_FSL_DIU)      += t1042rdb_diu.o
- obj-$(CONFIG_RED_15W_REV1)    += red15w_rev1.o