diff options
Diffstat (limited to 'arch/powerpc/boards')
-rw-r--r-- | arch/powerpc/boards/.gitignore | 2 | ||||
-rw-r--r-- | arch/powerpc/boards/freescale-p1010rdb/Makefile | 2 | ||||
-rw-r--r-- | arch/powerpc/boards/freescale-p1010rdb/ddr.c | 4 | ||||
-rw-r--r-- | arch/powerpc/boards/freescale-p1010rdb/p1010rdb.c | 3 | ||||
-rw-r--r-- | arch/powerpc/boards/freescale-p1022ds/Makefile | 2 | ||||
-rw-r--r-- | arch/powerpc/boards/freescale-p1022ds/ddr.c | 4 | ||||
-rw-r--r-- | arch/powerpc/boards/freescale-p1022ds/p1022ds.c | 3 | ||||
-rw-r--r-- | arch/powerpc/boards/freescale-p2020rdb/Makefile | 2 | ||||
-rw-r--r-- | arch/powerpc/boards/freescale-p2020rdb/p2020rdb.c | 1 | ||||
-rw-r--r-- | arch/powerpc/boards/owc-da923rc/Makefile | 2 | ||||
-rw-r--r-- | arch/powerpc/boards/owc-da923rc/da923rc.c | 1 | ||||
-rw-r--r-- | arch/powerpc/boards/pcm030/Makefile | 2 | ||||
-rw-r--r-- | arch/powerpc/boards/pcm030/barebox.lds.S | 4 | ||||
-rw-r--r-- | arch/powerpc/boards/pcm030/pcm030.c | 4 |
14 files changed, 23 insertions, 13 deletions
diff --git a/arch/powerpc/boards/.gitignore b/arch/powerpc/boards/.gitignore index d1165788c9..03987a7009 100644 --- a/arch/powerpc/boards/.gitignore +++ b/arch/powerpc/boards/.gitignore @@ -1 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only + barebox.lds diff --git a/arch/powerpc/boards/freescale-p1010rdb/Makefile b/arch/powerpc/boards/freescale-p1010rdb/Makefile index a7b64eef4d..e54ee8ee43 100644 --- a/arch/powerpc/boards/freescale-p1010rdb/Makefile +++ b/arch/powerpc/boards/freescale-p1010rdb/Makefile @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only + obj-y += p1010rdb.o obj-y += law.o obj-y += tlb.o diff --git a/arch/powerpc/boards/freescale-p1010rdb/ddr.c b/arch/powerpc/boards/freescale-p1010rdb/ddr.c index 18069f4df1..14fa426726 100644 --- a/arch/powerpc/boards/freescale-p1010rdb/ddr.c +++ b/arch/powerpc/boards/freescale-p1010rdb/ddr.c @@ -20,7 +20,7 @@ static const u8 spd_addr = 0x52; -int fsl_ddr_board_info(struct ddr_board_info_s *info) +void fsl_ddr_board_info(struct ddr_board_info_s *info) { p1010rdb_early_init(); @@ -34,8 +34,6 @@ int fsl_ddr_board_info(struct ddr_board_info_s *info) info->i2c_speed = 400000; info->i2c_base = IOMEM(I2C2_BASE_ADDR); info->spd_i2c_addr = &spd_addr; - - return 0; } void fsl_ddr_board_options(struct memctl_options_s *popts, diff --git a/arch/powerpc/boards/freescale-p1010rdb/p1010rdb.c b/arch/powerpc/boards/freescale-p1010rdb/p1010rdb.c index b163327597..e769933412 100644 --- a/arch/powerpc/boards/freescale-p1010rdb/p1010rdb.c +++ b/arch/powerpc/boards/freescale-p1010rdb/p1010rdb.c @@ -23,7 +23,6 @@ #include <i2c/i2c.h> #include <gpio.h> #include <envfs.h> -#include <partition.h> #include <memory.h> #include <asm/cache.h> #include <asm/fsl_ddr_sdram.h> @@ -37,6 +36,8 @@ #include <mach/early_udelay.h> #include <of.h> +#include "p1010rdb.h" + static struct gfar_info_struct gfar_info[] = { { .phyaddr = 1, diff --git a/arch/powerpc/boards/freescale-p1022ds/Makefile b/arch/powerpc/boards/freescale-p1022ds/Makefile index 48867fa851..1d969d48eb 100644 --- a/arch/powerpc/boards/freescale-p1022ds/Makefile +++ b/arch/powerpc/boards/freescale-p1022ds/Makefile @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only + obj-y += p1022ds.o obj-y += law.o obj-y += tlb.o diff --git a/arch/powerpc/boards/freescale-p1022ds/ddr.c b/arch/powerpc/boards/freescale-p1022ds/ddr.c index 1944518c79..3a8298f928 100644 --- a/arch/powerpc/boards/freescale-p1022ds/ddr.c +++ b/arch/powerpc/boards/freescale-p1022ds/ddr.c @@ -19,7 +19,7 @@ static const u8 spd_addr = 0x51; -int fsl_ddr_board_info(struct ddr_board_info_s *info) +void fsl_ddr_board_info(struct ddr_board_info_s *info) { /* * Early mapping is needed to access the clock @@ -37,8 +37,6 @@ int fsl_ddr_board_info(struct ddr_board_info_s *info) info->i2c_speed = 400000; info->i2c_base = IOMEM(I2C2_BASE_ADDR); info->spd_i2c_addr = &spd_addr; - - return 0; } struct board_specific_parameters { diff --git a/arch/powerpc/boards/freescale-p1022ds/p1022ds.c b/arch/powerpc/boards/freescale-p1022ds/p1022ds.c index d80c234ea9..fd07b6f89f 100644 --- a/arch/powerpc/boards/freescale-p1022ds/p1022ds.c +++ b/arch/powerpc/boards/freescale-p1022ds/p1022ds.c @@ -21,7 +21,6 @@ #include <net.h> #include <types.h> #include <i2c/i2c.h> -#include <partition.h> #include <memory.h> #include <envfs.h> #include <asm/cache.h> @@ -34,6 +33,8 @@ #include <mach/clock.h> #include <mach/early_udelay.h> +#include "p1022ds.h" + /* Define attributes for eTSEC1 and eTSEC2 */ static struct gfar_info_struct gfar_info[] = { { diff --git a/arch/powerpc/boards/freescale-p2020rdb/Makefile b/arch/powerpc/boards/freescale-p2020rdb/Makefile index b2497f695c..ff0cdd657c 100644 --- a/arch/powerpc/boards/freescale-p2020rdb/Makefile +++ b/arch/powerpc/boards/freescale-p2020rdb/Makefile @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only + obj-y += p2020rdb.o obj-y += law.o obj-y += tlb.o diff --git a/arch/powerpc/boards/freescale-p2020rdb/p2020rdb.c b/arch/powerpc/boards/freescale-p2020rdb/p2020rdb.c index cfbcc61e35..2c154db77c 100644 --- a/arch/powerpc/boards/freescale-p2020rdb/p2020rdb.c +++ b/arch/powerpc/boards/freescale-p2020rdb/p2020rdb.c @@ -20,7 +20,6 @@ #include <platform_data/serial-ns16550.h> #include <types.h> #include <i2c/i2c.h> -#include <partition.h> #include <memory.h> #include <envfs.h> #include <asm/cache.h> diff --git a/arch/powerpc/boards/owc-da923rc/Makefile b/arch/powerpc/boards/owc-da923rc/Makefile index 4cf6c5cf3c..78b6885c08 100644 --- a/arch/powerpc/boards/owc-da923rc/Makefile +++ b/arch/powerpc/boards/owc-da923rc/Makefile @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only + obj-y += da923rc.o obj-y += tlb.o obj-y += law.o diff --git a/arch/powerpc/boards/owc-da923rc/da923rc.c b/arch/powerpc/boards/owc-da923rc/da923rc.c index 2665a15091..b9eb2520cf 100644 --- a/arch/powerpc/boards/owc-da923rc/da923rc.c +++ b/arch/powerpc/boards/owc-da923rc/da923rc.c @@ -25,7 +25,6 @@ #include <gpio.h> #include <envfs.h> #include <platform_data/serial-ns16550.h> -#include <partition.h> #include <environment.h> #include <i2c/i2c.h> #include <asm/fsl_ddr_sdram.h> diff --git a/arch/powerpc/boards/pcm030/Makefile b/arch/powerpc/boards/pcm030/Makefile index 4e5dc4f57b..95dd061043 100644 --- a/arch/powerpc/boards/pcm030/Makefile +++ b/arch/powerpc/boards/pcm030/Makefile @@ -1,2 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only + obj-y += pcm030.o eeprom.o extra-y += barebox.lds diff --git a/arch/powerpc/boards/pcm030/barebox.lds.S b/arch/powerpc/boards/pcm030/barebox.lds.S index 2536db745c..146b63fe88 100644 --- a/arch/powerpc/boards/pcm030/barebox.lds.S +++ b/arch/powerpc/boards/pcm030/barebox.lds.S @@ -14,9 +14,9 @@ * */ -#include <asm-generic/barebox.lds.h> +#include <asm/barebox.lds.h> -OUTPUT_ARCH("powerpc") +OUTPUT_ARCH(BAREBOX_OUTPUT_ARCH) ENTRY(_start) /* Do we need any of these for elf? __DYNAMIC = 0; */ diff --git a/arch/powerpc/boards/pcm030/pcm030.c b/arch/powerpc/boards/pcm030/pcm030.c index 330d29868e..2bdbc6695d 100644 --- a/arch/powerpc/boards/pcm030/pcm030.c +++ b/arch/powerpc/boards/pcm030/pcm030.c @@ -25,7 +25,6 @@ #include <init.h> #include <platform_data/eth-fec.h> #include <types.h> -#include <partition.h> #include <memory.h> #include <linux/sizes.h> #include <linux/stat.h> @@ -143,6 +142,9 @@ static void sdram_start (int hi_addr) __asm__ volatile ("sync"); } +/* Called from assembly */ +void initdram(int board_type); + void initdram (int board_type) { ulong dramsize = 0; |