powerpc/40x: Remove WALNUT (5786074b) · Commits · 戴 / test

arch/powerpc/boot/Makefile

+1 −3

Original line number	Diff line number	Diff line
		@@ -75,7 +75,6 @@ $(obj)/cuboot-hotfoot.o: BOOTCFLAGS += -mcpu=405
		$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
		$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
		$(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
		$(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
		$(obj)/treeboot-iss4xx.o: BOOTCFLAGS += -mcpu=405
		$(obj)/treeboot-currituck.o: BOOTCFLAGS += -mcpu=405
		$(obj)/treeboot-akebono.o: BOOTCFLAGS += -mcpu=405
		@@ -132,7 +131,7 @@ src-wlib-$(CONFIG_CPM) += cpm-serial.c

		src-plat-y := of.c epapr.c
		src-plat-$(CONFIG_40x) += fixed-head.S ep405.c cuboot-hotfoot.c \
		treeboot-walnut.c cuboot-acadia.c \
		cuboot-acadia.c \
		cuboot-kilauea.c simpleboot.c
		src-plat-$(CONFIG_44x) += treeboot-ebony.c cuboot-ebony.c treeboot-bamboo.c \
		cuboot-bamboo.c cuboot-sam440ep.c \
		@@ -278,7 +277,6 @@ image-$(CONFIG_EPAPR_BOOT) += zImage.epapr
		# Board ports in arch/powerpc/platform/40x/Kconfig
		image-$(CONFIG_EP405) += dtbImage.ep405
		image-$(CONFIG_HOTFOOT) += cuImage.hotfoot
		image-$(CONFIG_WALNUT) += treeImage.walnut
		image-$(CONFIG_ACADIA) += cuImage.acadia
		image-$(CONFIG_OBS600) += uImage.obs600

arch/powerpc/boot/dts/walnut.dts

deleted100644 → 0

+0 −246

Original line number	Diff line number	Diff line
		/*
		* Device Tree Source for IBM Walnut
		*
		* Copyright 2007 IBM Corp.
		* Josh Boyer <jwboyer@linux.vnet.ibm.com>
		*
		* This file is licensed under the terms of the GNU General Public
		* License version 2. This program is licensed "as is" without
		* any warranty of any kind, whether express or implied.
		*/

		/dts-v1/;

		/ {
		#address-cells = <1>;
		#size-cells = <1>;
		model = "ibm,walnut";
		compatible = "ibm,walnut";
		dcr-parent = <&{/cpus/cpu@0}>;

		aliases {
		ethernet0 = &EMAC;
		serial0 = &UART0;
		serial1 = &UART1;
		};

		cpus {
		#address-cells = <1>;
		#size-cells = <0>;

		cpu@0 {
		device_type = "cpu";
		model = "PowerPC,405GP";
		reg = <0x00000000>;
		clock-frequency = <200000000>; /* Filled in by zImage */
		timebase-frequency = <0>; /* Filled in by zImage */
		i-cache-line-size = <32>;
		d-cache-line-size = <32>;
		i-cache-size = <16384>;
		d-cache-size = <16384>;
		dcr-controller;
		dcr-access-method = "native";
		};
		};

		memory {
		device_type = "memory";
		reg = <0x00000000 0x00000000>; /* Filled in by zImage */
		};

		UIC0: interrupt-controller {
		compatible = "ibm,uic";
		interrupt-controller;
		cell-index = <0>;
		dcr-reg = <0x0c0 0x009>;
		#address-cells = <0>;
		#size-cells = <0>;
		#interrupt-cells = <2>;
		};

		plb {
		compatible = "ibm,plb3";
		#address-cells = <1>;
		#size-cells = <1>;
		ranges;
		clock-frequency = <0>; /* Filled in by zImage */

		SDRAM0: memory-controller {
		compatible = "ibm,sdram-405gp";
		dcr-reg = <0x010 0x002>;
		};

		MAL: mcmal {
		compatible = "ibm,mcmal-405gp", "ibm,mcmal";
		dcr-reg = <0x180 0x062>;
		num-tx-chans = <1>;
		num-rx-chans = <1>;
		interrupt-parent = <&UIC0>;
		interrupts = <
		0xb 0x4 /* TXEOB */
		0xc 0x4 /* RXEOB */
		0xa 0x4 /* SERR */
		0xd 0x4 /* TXDE */
		0xe 0x4 /* RXDE */>;
		};

		POB0: opb {
		compatible = "ibm,opb-405gp", "ibm,opb";
		#address-cells = <1>;
		#size-cells = <1>;
		ranges = <0xef600000 0xef600000 0x00a00000>;
		dcr-reg = <0x0a0 0x005>;
		clock-frequency = <0>; /* Filled in by zImage */

		UART0: serial@ef600300 {
		device_type = "serial";
		compatible = "ns16550";
		reg = <0xef600300 0x00000008>;
		virtual-reg = <0xef600300>;
		clock-frequency = <0>; /* Filled in by zImage */
		current-speed = <9600>;
		interrupt-parent = <&UIC0>;
		interrupts = <0x0 0x4>;
		};

		UART1: serial@ef600400 {
		device_type = "serial";
		compatible = "ns16550";
		reg = <0xef600400 0x00000008>;
		virtual-reg = <0xef600400>;
		clock-frequency = <0>; /* Filled in by zImage */
		current-speed = <9600>;
		interrupt-parent = <&UIC0>;
		interrupts = <0x1 0x4>;
		};

		IIC: i2c@ef600500 {
		compatible = "ibm,iic-405gp", "ibm,iic";
		reg = <0xef600500 0x00000011>;
		interrupt-parent = <&UIC0>;
		interrupts = <0x2 0x4>;
		};

		GPIO: gpio@ef600700 {
		compatible = "ibm,gpio-405gp";
		reg = <0xef600700 0x00000020>;
		};

		EMAC: ethernet@ef600800 {
		device_type = "network";
		compatible = "ibm,emac-405gp", "ibm,emac";
		interrupt-parent = <&UIC0>;
		interrupts = <
		0xf 0x4 /* Ethernet */
		0x9 0x4 /* Ethernet Wake Up */>;
		local-mac-address = [000000000000]; /* Filled in by zImage */
		reg = <0xef600800 0x00000070>;
		mal-device = <&MAL>;
		mal-tx-channel = <0>;
		mal-rx-channel = <0>;
		cell-index = <0>;
		max-frame-size = <1500>;
		rx-fifo-size = <4096>;
		tx-fifo-size = <2048>;
		phy-mode = "rmii";
		phy-map = <0x00000001>;
		};

		};

		EBC0: ebc {
		compatible = "ibm,ebc-405gp", "ibm,ebc";
		dcr-reg = <0x012 0x002>;
		#address-cells = <2>;
		#size-cells = <1>;
		/* The ranges property is supplied by the bootwrapper
		* and is based on the firmware's configuration of the
		* EBC bridge
		*/
		clock-frequency = <0>; /* Filled in by zImage */

		sram@0,0 {
		reg = <0x00000000 0x00000000 0x00080000>;
		};

		flash@0,80000 {
		compatible = "jedec-flash";
		bank-width = <1>;
		reg = <0x00000000 0x00080000 0x00080000>;
		#address-cells = <1>;
		#size-cells = <1>;
		partition@0 {
		label = "OpenBIOS";
		reg = <0x00000000 0x00080000>;
		read-only;
		};
		};

		nvram@1,0 {
		/* NVRAM and RTC */
		compatible = "ds1743-nvram";
		#bytes = <0x2000>;
		reg = <0x00000001 0x00000000 0x00002000>;
		};

		keyboard@2,0 {
		compatible = "intel,82C42PC";
		reg = <0x00000002 0x00000000 0x00000002>;
		};

		ir@3,0 {
		compatible = "ti,TIR2000PAG";
		reg = <0x00000003 0x00000000 0x00000010>;
		};

		fpga@7,0 {
		compatible = "Walnut-FPGA";
		reg = <0x00000007 0x00000000 0x00000010>;
		virtual-reg = <0xf0300005>;
		};
		};

		PCI0: pci@ec000000 {
		device_type = "pci";
		#interrupt-cells = <1>;
		#size-cells = <2>;
		#address-cells = <3>;
		compatible = "ibm,plb405gp-pci", "ibm,plb-pci";
		primary;
		reg = <0xeec00000 0x00000008 /* Config space access */
		0xeed80000 0x00000004 /* IACK */
		0xeed80000 0x00000004 /* Special cycle */
		0xef480000 0x00000040>; /* Internal registers */

		/* Outbound ranges, one memory and one IO,
		* later cannot be changed. Chip supports a second
		* IO range but we don't use it for now
		*/
		ranges = <0x02000000 0x00000000 0x80000000 0x80000000 0x00000000 0x20000000
		0x01000000 0x00000000 0x00000000 0xe8000000 0x00000000 0x00010000>;

		/* Inbound 2GB range starting at 0 */
		dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x80000000>;

		/* Walnut has all 4 IRQ pins tied together per slot */
		interrupt-map-mask = <0xf800 0x0 0x0 0x0>;
		interrupt-map = <
		/* IDSEL 1 */
		0x800 0x0 0x0 0x0 &UIC0 0x1c 0x8

		/* IDSEL 2 */
		0x1000 0x0 0x0 0x0 &UIC0 0x1d 0x8

		/* IDSEL 3 */
		0x1800 0x0 0x0 0x0 &UIC0 0x1e 0x8

		/* IDSEL 4 */
		0x2000 0x0 0x0 0x0 &UIC0 0x1f 0x8
		>;
		};
		};

		chosen {
		stdout-path = "/plb/opb/serial@ef600300";
		};
		};

arch/powerpc/boot/treeboot-walnut.c

deleted100644 → 0

+0 −81

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Old U-boot compatibility for Walnut
		*
		* Author: Josh Boyer <jwboyer@linux.vnet.ibm.com>
		*
		* Copyright 2007 IBM Corporation
		* Based on cuboot-83xx.c, which is:
		* Copyright (c) 2007 Freescale Semiconductor, Inc.
		*/

		#include "ops.h"
		#include "stdio.h"
		#include "dcr.h"
		#include "4xx.h"
		#include "io.h"

		BSS_STACK(4096);

		static void walnut_flashsel_fixup(void)
		{
		void devp, sram;
		u32 reg_flash[3] = {0x0, 0x0, 0x80000};
		u32 reg_sram[3] = {0x0, 0x0, 0x80000};
		u8 *fpga;
		u8 fpga_brds1 = 0x0;

		devp = finddevice("/plb/ebc/fpga");
		if (!devp)
		fatal("Couldn't locate FPGA node\n\r");

		if (getprop(devp, "virtual-reg", &fpga, sizeof(fpga)) != sizeof(fpga))
		fatal("no virtual-reg property\n\r");

		fpga_brds1 = in_8(fpga);

		devp = finddevice("/plb/ebc/flash");
		if (!devp)
		fatal("Couldn't locate flash node\n\r");

		if (getprop(devp, "reg", reg_flash, sizeof(reg_flash)) != sizeof(reg_flash))
		fatal("flash reg property has unexpected size\n\r");

		sram = finddevice("/plb/ebc/sram");
		if (!sram)
		fatal("Couldn't locate sram node\n\r");

		if (getprop(sram, "reg", reg_sram, sizeof(reg_sram)) != sizeof(reg_sram))
		fatal("sram reg property has unexpected size\n\r");

		if (fpga_brds1 & 0x1) {
		reg_flash[1] ^= 0x80000;
		reg_sram[1] ^= 0x80000;
		}

		setprop(devp, "reg", reg_flash, sizeof(reg_flash));
		setprop(sram, "reg", reg_sram, sizeof(reg_sram));
		}

		#define WALNUT_OPENBIOS_MAC_OFF 0xfffffe0b
		static void walnut_fixups(void)
		{
		ibm4xx_sdram_fixup_memsize();
		ibm405gp_fixup_clocks(33330000, 0xa8c000);
		ibm4xx_quiesce_eth((u32 *)0xef600800, NULL);
		ibm4xx_fixup_ebc_ranges("/plb/ebc");
		walnut_flashsel_fixup();
		dt_fixup_mac_address_by_alias("ethernet0", (u8 *) WALNUT_OPENBIOS_MAC_OFF);
		}

		void platform_init(void)
		{
		unsigned long end_of_ram = 0x2000000;
		unsigned long avail_ram = end_of_ram - (unsigned long) _end;

		simple_alloc_init(_end, avail_ram, 32, 32);
		platform_ops.fixups = walnut_fixups;
		platform_ops.exit = ibm40x_dbcr_reset;
		fdt_init(_dtb_start);
		serial_console_init();
		}

arch/powerpc/configs/40x/acadia_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,6 @@ CONFIG_MODULES=y
		CONFIG_MODULE_UNLOAD=y
		# CONFIG_BLK_DEV_BSG is not set
		CONFIG_ACADIA=y
		# CONFIG_WALNUT is not set
		CONFIG_PCI=y
		CONFIG_NET=y
		CONFIG_PACKET=y

arch/powerpc/configs/40x/kilauea_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@ CONFIG_MODULES=y
		CONFIG_MODULE_UNLOAD=y
		# CONFIG_BLK_DEV_BSG is not set
		CONFIG_KILAUEA=y
		# CONFIG_WALNUT is not set
		CONFIG_PCI=y
		CONFIG_NET=y
		CONFIG_PACKET=y

Admin message