|
|
@@ -0,0 +1,347 @@
|
|
|
+--- /dev/null
|
|
|
++++ b/arch/powerpc/boot/cuboot-magicboxv2.c
|
|
|
+@@ -0,0 +1,40 @@
|
|
|
++/*
|
|
|
++ * Old U-boot compatibility for Magicbox v2
|
|
|
++ *
|
|
|
++ * Author: Imre Kaloz <[email protected]>
|
|
|
++ *
|
|
|
++ * This program is free software; you can redistribute it and/or modify it
|
|
|
++ * under the terms of the GNU General Public License version 2 as published
|
|
|
++ * by the Free Software Foundation.
|
|
|
++ */
|
|
|
++
|
|
|
++#include "ops.h"
|
|
|
++#include "io.h"
|
|
|
++#include "dcr.h"
|
|
|
++#include "stdio.h"
|
|
|
++#include "4xx.h"
|
|
|
++#include "44x.h"
|
|
|
++#include "cuboot.h"
|
|
|
++
|
|
|
++#define TARGET_4xx
|
|
|
++#define TARGET_405EP
|
|
|
++#include "ppcboot.h"
|
|
|
++
|
|
|
++static bd_t bd;
|
|
|
++
|
|
|
++static void magicboxv2_fixups(void)
|
|
|
++{
|
|
|
++ ibm405ep_fixup_clocks(25000000);
|
|
|
++ ibm4xx_sdram_fixup_memsize();
|
|
|
++ dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);
|
|
|
++}
|
|
|
++
|
|
|
++void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
|
|
|
++ unsigned long r6, unsigned long r7)
|
|
|
++{
|
|
|
++ CUBOOT_INIT();
|
|
|
++ platform_ops.fixups = magicboxv2_fixups;
|
|
|
++ platform_ops.exit = ibm40x_dbcr_reset;
|
|
|
++ fdt_init(_dtb_start);
|
|
|
++ serial_console_init();
|
|
|
++}
|
|
|
+--- /dev/null
|
|
|
++++ b/arch/powerpc/boot/dts/magicboxv2.dts
|
|
|
+@@ -0,0 +1,250 @@
|
|
|
++/*
|
|
|
++ * Device Tree Source for Magicbox v2
|
|
|
++ *
|
|
|
++ * Copyright 2008 Imre Kaloz <[email protected]>
|
|
|
++ *
|
|
|
++ * Based on walnut.dts
|
|
|
++ *
|
|
|
++ * 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 = "magicboxv2";
|
|
|
++ compatible = "magicboxv2";
|
|
|
++ dcr-parent = <&{/cpus/cpu@0}>;
|
|
|
++
|
|
|
++ aliases {
|
|
|
++ ethernet0 = &EMAC0;
|
|
|
++ ethernet1 = &EMAC1;
|
|
|
++ serial0 = &UART0;
|
|
|
++ serial1 = &UART1;
|
|
|
++ };
|
|
|
++
|
|
|
++ cpus {
|
|
|
++ #address-cells = <1>;
|
|
|
++ #size-cells = <0>;
|
|
|
++
|
|
|
++ cpu@0 {
|
|
|
++ device_type = "cpu";
|
|
|
++ model = "PowerPC,405EP";
|
|
|
++ reg = <0x00000000>;
|
|
|
++ clock-frequency = <0xbebc200>; /* Filled in by zImage */
|
|
|
++ timebase-frequency = <0>; /* Filled in by zImage */
|
|
|
++ i-cache-line-size = <20>;
|
|
|
++ d-cache-line-size = <20>;
|
|
|
++ i-cache-size = <4000>;
|
|
|
++ d-cache-size = <4000>;
|
|
|
++ 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-405ep";
|
|
|
++ dcr-reg = <0x010 0x002>;
|
|
|
++ };
|
|
|
++
|
|
|
++ MAL: mcmal {
|
|
|
++ compatible = "ibm,mcmal-405ep", "ibm,mcmal";
|
|
|
++ dcr-reg = <0x180 0x062>;
|
|
|
++ num-tx-chans = <4>;
|
|
|
++ num-rx-chans = <2>;
|
|
|
++ interrupt-parent = <&UIC0>;
|
|
|
++ interrupts = <
|
|
|
++ 0xb 0x4 /* TXEOB */
|
|
|
++ 0xc 0x4 /* RXEOB */
|
|
|
++ 0xa 0x4 /* SERR */
|
|
|
++ 0xd 0x4 /* TXDE */
|
|
|
++ 0xe 0x4 /* RXDE */>;
|
|
|
++ };
|
|
|
++
|
|
|
++ POB0: opb {
|
|
|
++ compatible = "ibm,opb-405ep", "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 = <115200>;
|
|
|
++ 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 = <115200>;
|
|
|
++ interrupt-parent = <&UIC0>;
|
|
|
++ interrupts = <0x1 0x4>;
|
|
|
++ };
|
|
|
++
|
|
|
++ IIC: i2c@ef600500 {
|
|
|
++ compatible = "ibm,iic-405ep", "ibm,iic";
|
|
|
++ reg = <0xef600500 0x00000011>;
|
|
|
++ interrupt-parent = <&UIC0>;
|
|
|
++ interrupts = <0x2 0x4>;
|
|
|
++ };
|
|
|
++
|
|
|
++ GPIO: gpio@ef600700 {
|
|
|
++ compatible = "ibm,gpio-405ep";
|
|
|
++ reg = <0xef600700 0x00000020>;
|
|
|
++ };
|
|
|
++
|
|
|
++ EMAC0: ethernet@ef600800 {
|
|
|
++ linux,network-index = <0x0>;
|
|
|
++ device_type = "network";
|
|
|
++ compatible = "ibm,emac-405ep", "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 = <0x5dc>;
|
|
|
++ rx-fifo-size = <0x1000>;
|
|
|
++ tx-fifo-size = <0x800>;
|
|
|
++ phy-mode = "mii";
|
|
|
++ phy-map = <0x00000000>;
|
|
|
++ };
|
|
|
++ EMAC1: ethernet@ef600900 {
|
|
|
++ linux,network-index = <0x1>;
|
|
|
++ device_type = "network";
|
|
|
++ compatible = "ibm,emac-405ep", "ibm,emac";
|
|
|
++ interrupt-parent = <&UIC0>;
|
|
|
++ interrupts = <
|
|
|
++ 0x11 0x4 /* Ethernet */
|
|
|
++ 0x09 0x4 /* Ethernet Wake Up */>;
|
|
|
++ local-mac-address = [000000000000]; /* Filled in by zImage */
|
|
|
++ reg = <0xef600900 0x00000070>;
|
|
|
++ mal-device = <&MAL>;
|
|
|
++ mal-tx-channel = <2>;
|
|
|
++ mal-rx-channel = <1>;
|
|
|
++ cell-index = <1>;
|
|
|
++ max-frame-size = <0x5dc>;
|
|
|
++ rx-fifo-size = <0x1000>;
|
|
|
++ tx-fifo-size = <0x800>;
|
|
|
++ mdio-device = <&EMAC0>;
|
|
|
++ phy-mode = "mii";
|
|
|
++ phy-map = <0x00000001>;
|
|
|
++ };
|
|
|
++
|
|
|
++ };
|
|
|
++
|
|
|
++ EBC0: ebc {
|
|
|
++ compatible = "ibm,ebc-405ep", "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 */
|
|
|
++
|
|
|
++ nor_flash@ffc00000 {
|
|
|
++ compatible = "cfi-flash";
|
|
|
++ bank-width = <2>;
|
|
|
++ reg = <0x00000000 0xffc00000 0x00400000>;
|
|
|
++ #address-cells = <1>;
|
|
|
++ #size-cells = <1>;
|
|
|
++ partition@0 {
|
|
|
++ label = "linux";
|
|
|
++ reg = <0x0 0x3c0000>;
|
|
|
++ };
|
|
|
++ partition@100000 {
|
|
|
++ label = "rootfs";
|
|
|
++ reg = <0x100000 0x2c0000>;
|
|
|
++ };
|
|
|
++ partition@3c0000 {
|
|
|
++ label = "u-boot";
|
|
|
++ reg = <0x3c0000 0x30000>;
|
|
|
++ read-only;
|
|
|
++ };
|
|
|
++ };
|
|
|
++ };
|
|
|
++
|
|
|
++ PCI0: pci@ec000000 {
|
|
|
++ device_type = "pci";
|
|
|
++ #interrupt-cells = <1>;
|
|
|
++ #size-cells = <2>;
|
|
|
++ #address-cells = <3>;
|
|
|
++ compatible = "ibm,plb405ep-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>;
|
|
|
++
|
|
|
++ 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 {
|
|
|
++ linux,stdout-path = "/plb/opb/serial@ef600300";
|
|
|
++ };
|
|
|
++};
|
|
|
+--- a/arch/powerpc/boot/Makefile
|
|
|
++++ b/arch/powerpc/boot/Makefile
|
|
|
+@@ -75,7 +75,8 @@ src-plat := of.c cuboot-52xx.c cuboot-82
|
|
|
+ cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
|
|
|
+ cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
|
|
|
+ virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \
|
|
|
+- cuboot-acadia.c cuboot-amigaone.c cuboot-magicboxv1.c
|
|
|
++ cuboot-acadia.c cuboot-amigaone.c cuboot-magicboxv1.c \
|
|
|
++ cuboot-magicboxv2.c
|
|
|
+ src-boot := $(src-wlib) $(src-plat) empty.c
|
|
|
+
|
|
|
+ src-boot := $(addprefix $(obj)/, $(src-boot))
|
|
|
+@@ -193,6 +194,7 @@ image-$(CONFIG_EP405) += dtbImage.ep40
|
|
|
+ image-$(CONFIG_WALNUT) += treeImage.walnut
|
|
|
+ image-$(CONFIG_ACADIA) += cuImage.acadia
|
|
|
+ image-$(CONFIG_MAGICBOXV1) += cuImage.magicboxv1
|
|
|
++image-$(CONFIG_MAGICBOXV2) += cuImage.magicboxv2
|
|
|
+
|
|
|
+ # Board ports in arch/powerpc/platform/44x/Kconfig
|
|
|
+ image-$(CONFIG_EBONY) += treeImage.ebony cuImage.ebony
|
|
|
+--- a/arch/powerpc/platforms/40x/Kconfig
|
|
|
++++ b/arch/powerpc/platforms/40x/Kconfig
|
|
|
+@@ -59,6 +59,16 @@ config MAGICBOXV1
|
|
|
+ help
|
|
|
+ This option enables support for the Magicbox v1 board.
|
|
|
+
|
|
|
++config MAGICBOXV2
|
|
|
++ bool "Magicbox v2"
|
|
|
++ depends on 40x
|
|
|
++ default n
|
|
|
++ select PPC40x_SIMPLE
|
|
|
++ select 405EP
|
|
|
++ select PCI
|
|
|
++ help
|
|
|
++ This option enables support for the Magicbox v2 board.
|
|
|
++
|
|
|
+ config MAKALU
|
|
|
+ bool "Makalu"
|
|
|
+ depends on 40x
|
|
|
+--- a/arch/powerpc/platforms/40x/ppc40x_simple.c
|
|
|
++++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
|
|
|
+@@ -52,7 +52,8 @@ machine_device_initcall(ppc40x_simple, p
|
|
|
+ */
|
|
|
+ static char *board[] __initdata = {
|
|
|
+ "amcc,acadia",
|
|
|
+- "magicboxv1"
|
|
|
++ "magicboxv1",
|
|
|
++ "magicboxv2",
|
|
|
+ };
|
|
|
+
|
|
|
+ static int __init ppc40x_probe(void)
|
Gabor Juhos