diff options
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r-- | arch/powerpc/boot/Makefile | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8641_hpcn.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/tqm8548-bigflash.dts | 8 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/tqm8548.dts | 3 | ||||
-rwxr-xr-x | arch/powerpc/boot/wrapper | 2 |
5 files changed, 12 insertions, 5 deletions
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 14174aa24074..717a3bc1352e 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
@@ -49,7 +49,7 @@ zlib := inffast.c inflate.c inftrees.c | |||
49 | zlibheader := inffast.h inffixed.h inflate.h inftrees.h infutil.h | 49 | zlibheader := inffast.h inffixed.h inflate.h inftrees.h infutil.h |
50 | zliblinuxheader := zlib.h zconf.h zutil.h | 50 | zliblinuxheader := zlib.h zconf.h zutil.h |
51 | 51 | ||
52 | $(addprefix $(obj)/,$(zlib) gunzip_util.o main.o): \ | 52 | $(addprefix $(obj)/,$(zlib) cuboot-c2k.o gunzip_util.o main.o prpmc2800.o): \ |
53 | $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader)) | 53 | $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader)) |
54 | 54 | ||
55 | src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c | 55 | src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c |
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts index ae08761ffff1..d665e767822a 100644 --- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts +++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts | |||
@@ -411,7 +411,7 @@ | |||
411 | 0xe000 0 0 1 &i8259 12 2 | 411 | 0xe000 0 0 1 &i8259 12 2 |
412 | 0xe100 0 0 2 &i8259 9 2 | 412 | 0xe100 0 0 2 &i8259 9 2 |
413 | 0xe200 0 0 3 &i8259 10 2 | 413 | 0xe200 0 0 3 &i8259 10 2 |
414 | 0xe300 0 0 4 &i8259 112 | 414 | 0xe300 0 0 4 &i8259 11 2 |
415 | 415 | ||
416 | // IDSEL 0x1d Audio | 416 | // IDSEL 0x1d Audio |
417 | 0xe800 0 0 1 &i8259 6 2 | 417 | 0xe800 0 0 1 &i8259 6 2 |
diff --git a/arch/powerpc/boot/dts/tqm8548-bigflash.dts b/arch/powerpc/boot/dts/tqm8548-bigflash.dts index 64d2d5bbcdf1..4199e89b4e50 100644 --- a/arch/powerpc/boot/dts/tqm8548-bigflash.dts +++ b/arch/powerpc/boot/dts/tqm8548-bigflash.dts | |||
@@ -50,13 +50,14 @@ | |||
50 | reg = <0x00000000 0x00000000>; // Filled in by U-Boot | 50 | reg = <0x00000000 0x00000000>; // Filled in by U-Boot |
51 | }; | 51 | }; |
52 | 52 | ||
53 | soc8548@a0000000 { | 53 | soc@a0000000 { |
54 | #address-cells = <1>; | 54 | #address-cells = <1>; |
55 | #size-cells = <1>; | 55 | #size-cells = <1>; |
56 | device_type = "soc"; | 56 | device_type = "soc"; |
57 | ranges = <0x0 0xa0000000 0x100000>; | 57 | ranges = <0x0 0xa0000000 0x100000>; |
58 | reg = <0xa0000000 0x1000>; // CCSRBAR | 58 | reg = <0xa0000000 0x1000>; // CCSRBAR |
59 | bus-frequency = <0>; | 59 | bus-frequency = <0>; |
60 | compatible = "fsl,mpc8548-immr", "simple-bus"; | ||
60 | 61 | ||
61 | memory-controller@2000 { | 62 | memory-controller@2000 { |
62 | compatible = "fsl,mpc8548-memory-controller"; | 63 | compatible = "fsl,mpc8548-memory-controller"; |
@@ -83,6 +84,11 @@ | |||
83 | interrupts = <43 2>; | 84 | interrupts = <43 2>; |
84 | interrupt-parent = <&mpic>; | 85 | interrupt-parent = <&mpic>; |
85 | dfsrr; | 86 | dfsrr; |
87 | |||
88 | rtc@68 { | ||
89 | compatible = "dallas,ds1337"; | ||
90 | reg = <0x68>; | ||
91 | }; | ||
86 | }; | 92 | }; |
87 | 93 | ||
88 | i2c@3100 { | 94 | i2c@3100 { |
diff --git a/arch/powerpc/boot/dts/tqm8548.dts b/arch/powerpc/boot/dts/tqm8548.dts index 2563112cabd3..58ee4185454b 100644 --- a/arch/powerpc/boot/dts/tqm8548.dts +++ b/arch/powerpc/boot/dts/tqm8548.dts | |||
@@ -50,13 +50,14 @@ | |||
50 | reg = <0x00000000 0x00000000>; // Filled in by U-Boot | 50 | reg = <0x00000000 0x00000000>; // Filled in by U-Boot |
51 | }; | 51 | }; |
52 | 52 | ||
53 | soc8548@e0000000 { | 53 | soc@e0000000 { |
54 | #address-cells = <1>; | 54 | #address-cells = <1>; |
55 | #size-cells = <1>; | 55 | #size-cells = <1>; |
56 | device_type = "soc"; | 56 | device_type = "soc"; |
57 | ranges = <0x0 0xe0000000 0x100000>; | 57 | ranges = <0x0 0xe0000000 0x100000>; |
58 | reg = <0xe0000000 0x1000>; // CCSRBAR | 58 | reg = <0xe0000000 0x1000>; // CCSRBAR |
59 | bus-frequency = <0>; | 59 | bus-frequency = <0>; |
60 | compatible = "fsl,mpc8548-immr", "simple-bus"; | ||
60 | 61 | ||
61 | memory-controller@2000 { | 62 | memory-controller@2000 { |
62 | compatible = "fsl,mpc8548-memory-controller"; | 63 | compatible = "fsl,mpc8548-memory-controller"; |
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper index 644bf9d4ea00..965c237c122d 100755 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper | |||
@@ -165,7 +165,7 @@ cuboot*) | |||
165 | binary=y | 165 | binary=y |
166 | gzip= | 166 | gzip= |
167 | case "$platform" in | 167 | case "$platform" in |
168 | *-mpc885ads|*-adder875*|*-ep88xc) | 168 | *-mpc866ads|*-mpc885ads|*-adder875*|*-ep88xc) |
169 | platformo=$object/cuboot-8xx.o | 169 | platformo=$object/cuboot-8xx.o |
170 | ;; | 170 | ;; |
171 | *5200*|*-motionpro) | 171 | *5200*|*-motionpro) |