mpc85xx: fix up kernel config and make the target boot on the MPC8568E-MDS-PB board

SVN-Revision: 24736

diff --git a/target/linux/mpc85xx/config-default b/target/linux/mpc85xx/config-default
index 10f1d2c92d93585a9424008997db55d86b9d58c7..dfde393434d4b603e5a20caff3e0120c53b5c610 100644 (file)
--- a/target/linux/mpc85xx/config-default
+++ b/target/linux/mpc85xx/config-default
@@ -10,6 +10,7 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 # CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
 CONFIG_ARCH_POPULATES_NODE_MAP=y
 # CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
 CONFIG_ARCH_POPULATES_NODE_MAP=y

+CONFIG_ARCH_REQUIRE_GPIOLIB=y

 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y


@@ -20,7 +21,7 @@ CONFIG_BOOKE=y
 CONFIG_BOUNCE=y
 # CONFIG_BRIDGE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_BOUNCE=y
 # CONFIG_BRIDGE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set

-CONFIG_CMDLINE="console=ttyPSC0,115200"
+CONFIG_CMDLINE="console=ttyS0,115200"

 CONFIG_CMDLINE_BOOL=y
 CONFIG_COMPAT_BRK=y
 # CONFIG_CPM2 is not set
 CONFIG_CMDLINE_BOOL=y
 CONFIG_COMPAT_BRK=y
 # CONFIG_CPM2 is not set


@@ -60,10 +61,10 @@ CONFIG_FSL_BOOKE=y
 CONFIG_FSL_EMB_PERFMON=y
 CONFIG_FSL_PCI=y
 CONFIG_FSL_PMC=y
 CONFIG_FSL_EMB_PERFMON=y
 CONFIG_FSL_PCI=y
 CONFIG_FSL_PMC=y

+CONFIG_FSL_PQ_MDIO=y

 CONFIG_FSL_SOC=y
 CONFIG_FSL_SOC_BOOKE=y
 # CONFIG_FSL_ULI1575 is not set
 CONFIG_FSL_SOC=y
 CONFIG_FSL_SOC_BOOKE=y
 # CONFIG_FSL_ULI1575 is not set

-# CONFIG_FW_LOADER is not set

 CONFIG_GENERIC_ATOMIC64=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_ATOMIC64=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y


@@ -80,12 +81,13 @@ CONFIG_GENERIC_NVRAM=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set

+CONFIG_GIANFAR=y

 CONFIG_GPIOLIB=y
 # CONFIG_HAMRADIO is not set
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_GPIOLIB=y
 # CONFIG_HAMRADIO is not set
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y

-# CONFIG_HAS_RAPIDIO is not set
+CONFIG_HAS_RAPIDIO=y

 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_API_DEBUG=y


@@ -112,7 +114,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
 CONFIG_INET_TCP_DIAG=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y

-# CONFIG_IOMMU_HELPER is not set
+CONFIG_IOMMU_HELPER=y

 CONFIG_IOSCHED_CFQ=y
 # CONFIG_IPIC is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IOSCHED_CFQ=y
 # CONFIG_IPIC is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set


@@ -140,9 +142,9 @@ CONFIG_MIGRATION=y
 # CONFIG_MPC8560_ADS is not set
 CONFIG_MPC85xx_CDS=y
 # CONFIG_MPC85xx_DS is not set
 # CONFIG_MPC8560_ADS is not set
 CONFIG_MPC85xx_CDS=y
 # CONFIG_MPC85xx_DS is not set

-# CONFIG_MPC85xx_MDS is not set
+CONFIG_MPC85xx_MDS=y

 # CONFIG_MPC85xx_RDB is not set
 # CONFIG_MPC85xx_RDB is not set

-# CONFIG_MPC8xxx_GPIO is not set
+CONFIG_MPC8xxx_GPIO=y

 CONFIG_MPIC=y
 # CONFIG_MPIC_U3_HT_IRQS is not set
 # CONFIG_MPIC_WEIRD is not set
 CONFIG_MPIC=y
 # CONFIG_MPIC_U3_HT_IRQS is not set
 # CONFIG_MPIC_WEIRD is not set


@@ -150,7 +152,6 @@ CONFIG_MPIC=y
 # CONFIG_NEED_DMA_MAP_STATE is not set
 # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
 CONFIG_NEED_SG_DMA_LENGTH=y
 # CONFIG_NEED_DMA_MAP_STATE is not set
 # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
 CONFIG_NEED_SG_DMA_LENGTH=y

-# CONFIG_NETDEV_1000 is not set

 # CONFIG_NET_PCI is not set
 # CONFIG_NET_SCHED is not set
 # CONFIG_NEW_LEDS is not set
 # CONFIG_NET_PCI is not set
 # CONFIG_NET_SCHED is not set
 # CONFIG_NEW_LEDS is not set


@@ -202,6 +203,7 @@ CONFIG_PPC_BOOK3E_MMU=y
 CONFIG_PPC_I8259=y
 # CONFIG_PPC_INDIRECT_IO is not set
 CONFIG_PPC_INDIRECT_PCI=y
 CONFIG_PPC_I8259=y
 # CONFIG_PPC_INDIRECT_IO is not set
 CONFIG_PPC_INDIRECT_PCI=y

+CONFIG_PPC_LIB_RHEAP=y

 CONFIG_PPC_MMU_NOHASH=y
 CONFIG_PPC_MMU_NOHASH_32=y
 # CONFIG_PPC_MM_SLICES is not set
 CONFIG_PPC_MMU_NOHASH=y
 CONFIG_PPC_MMU_NOHASH_32=y
 # CONFIG_PPC_MM_SLICES is not set


@@ -215,7 +217,9 @@ CONFIG_PPC_WERROR=y
 CONFIG_PRINT_STACK_DEPTH=64
 CONFIG_PROC_DEVICETREE=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_PRINT_STACK_DEPTH=64
 CONFIG_PROC_DEVICETREE=y
 CONFIG_PROC_PAGE_MONITOR=y

-# CONFIG_QUICC_ENGINE is not set
+CONFIG_QE_GPIO=y
+CONFIG_QUICC_ENGINE=y
+# CONFIG_RAPIDIO is not set

 # CONFIG_RD_LZMA is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 # CONFIG_SBC8548 is not set
 # CONFIG_RD_LZMA is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 # CONFIG_SBC8548 is not set


@@ -223,7 +227,9 @@ CONFIG_SBC8560=y
 CONFIG_SCHED_HRTICK=y
 # CONFIG_SCSI_DMA is not set
 CONFIG_SECCOMP=y
 CONFIG_SCHED_HRTICK=y
 # CONFIG_SCSI_DMA is not set
 CONFIG_SECCOMP=y

-# CONFIG_SERIAL_8250 is not set
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_OF_PLATFORM=y
+# CONFIG_SERIAL_QE is not set

 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SOCRATES is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SOCRATES is not set


@@ -234,7 +240,7 @@ CONFIG_SPE=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_SUSPEND_NVS=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_SUSPEND_NVS=y

-# CONFIG_SWIOTLB is not set
+CONFIG_SWIOTLB=y

 # CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y


@@ -246,6 +252,10 @@ CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TQM8548 is not set
 # CONFIG_TQM8555 is not set
 # CONFIG_TQM8560 is not set
 # CONFIG_TQM8548 is not set
 # CONFIG_TQM8555 is not set
 # CONFIG_TQM8560 is not set

+CONFIG_UCC=y
+CONFIG_UCC_FAST=y
+CONFIG_UCC_GETH=y
+# CONFIG_UGETH_TX_ON_DEMAND is not set

 CONFIG_USB_SUPPORT=y
 CONFIG_VIDEO_OUTPUT_CONTROL=m
 # CONFIG_VLAN_8021Q is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_VIDEO_OUTPUT_CONTROL=m
 # CONFIG_VLAN_8021Q is not set

diff --git a/target/linux/mpc85xx/patches/100-fix_mpc8568e_mds.patch b/target/linux/mpc85xx/patches/100-fix_mpc8568e_mds.patch
new file mode 100644 (file)
index 0000000..d1e672a
--- /dev/null
+++ b/target/linux/mpc85xx/patches/100-fix_mpc8568e_mds.patch
@@ -0,0 +1,60 @@
+--- a/arch/powerpc/boot/dts/mpc8568mds.dts
++++ b/arch/powerpc/boot/dts/mpc8568mds.dts
+@@ -301,32 +301,24 @@
+                       };
+               };
+ 
+-              duart-sleep-nexus {
+-                      #address-cells = <1>;
+-                      #size-cells = <1>;
+-                      compatible = "simple-bus";
+-                      sleep = <&pmc 0x00000002>;
+-                      ranges;
+-
+-                      serial0: serial@4500 {
+-                              cell-index = <0>;
+-                              device_type = "serial";
+-                              compatible = "ns16550";
+-                              reg = <0x4500 0x100>;
+-                              clock-frequency = <0>;
+-                              interrupts = <42 2>;
+-                              interrupt-parent = <&mpic>;
+-                      };
++              serial0: serial@4500 {
++                      cell-index = <0>;
++                      device_type = "serial";
++                      compatible = "ns16550";
++                      reg = <0x4500 0x100>;
++                      clock-frequency = <0>;
++                      interrupts = <42 2>;
++                      interrupt-parent = <&mpic>;
++              };
+ 
+-                      serial1: serial@4600 {
+-                              cell-index = <1>;
+-                              device_type = "serial";
+-                              compatible = "ns16550";
+-                              reg = <0x4600 0x100>;
+-                              clock-frequency = <0>;
+-                              interrupts = <42 2>;
+-                              interrupt-parent = <&mpic>;
+-                      };
++              serial1: serial@4600 {
++                      cell-index = <1>;
++                      device_type = "serial";
++                      compatible = "ns16550";
++                      reg = <0x4600 0x100>;
++                      clock-frequency = <0>;
++                      interrupts = <42 2>;
++                      interrupt-parent = <&mpic>;
+               };
+ 
+               global-utilities@e0000 {
+@@ -669,4 +661,7 @@
+                       gpios = <&bcsr5 3 0>;
+               };
+       };
++      chosen {
++              linux,stdout-path = "/soc8568@e0000000/serial@4500";
++      };
+ };