diff options
Diffstat (limited to 'arch')
87 files changed, 92 insertions, 146 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index e599e7a39c..dd5a887001 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -75,6 +75,7 @@ config SANDBOX select DM_GPIO select DM_MMC select HAVE_BLOCK_DEVICE + select SPI select LZO imply CMD_GETTIME imply CMD_HASH diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0acdd162b4..9bd70f4322 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -242,6 +242,16 @@ config SYS_CACHELINE_SIZE default 64 if SYS_CACHE_SHIFT_6 default 32 if SYS_CACHE_SHIFT_5 +config SYS_ARCH_TIMER + bool "ARM Generic Timer support" + depends on CPU_V7 || ARM64 + default y if ARM64 + help + The ARM Generic Timer (aka arch-timer) provides an architected + interface to a timer source on an SoC. + It is mandantory for ARMv8 implementation and widely available + on ARMv7 systems. + config ARM_SMCCC bool "Support for ARM SMC Calling Convention (SMCCC)" depends on CPU_V7 || ARM64 @@ -379,6 +389,7 @@ config ARCH_MVEBU select DM_SERIAL select DM_SPI select DM_SPI_FLASH + select SPI config TARGET_DEVKIT3250 bool "Support devkit3250" @@ -434,6 +445,7 @@ config TARGET_STV0991 select DM_SERIAL select DM_SPI select DM_SPI_FLASH + select SPI select SPI_FLASH select PL01X_SERIAL @@ -540,6 +552,7 @@ config ARCH_EXYNOS select DM_SPI select DM_GPIO select DM_KEYBOARD + select SPI imply FAT_WRITE config ARCH_S5PC1XX @@ -567,6 +580,7 @@ config ARCH_KEYSTONE select SUPPORT_SPL select SYS_THUMB_BUILD select CMD_POWEROFF + select SYS_ARCH_TIMER imply CMD_MTDPARTS imply FIT imply CMD_SAVES @@ -581,6 +595,7 @@ config ARCH_OMAP2PLUS config ARCH_MESON bool "Amlogic Meson" + imply DISTRO_DEFAULTS help Support for the Meson SoC family developed by Amlogic Inc., targeted at media players and tablet computers. We currently @@ -720,6 +735,7 @@ config ARCH_SUNXI select USB_KEYBOARD if DISTRO_DEFAULTS select USE_TINY_PRINTF imply CMD_GPT + imply DISTRO_DEFAULTS imply FAT_WRITE imply OF_LIBFDT_OVERLAY imply PRE_CONSOLE_BUFFER @@ -760,6 +776,7 @@ config ARCH_ZYNQ select CLK select SPL_CLK if SPL select CLK_ZYNQ + select SPI imply CMD_CLK imply FAT_WRITE imply CMD_SPL @@ -780,6 +797,7 @@ config ARCH_ZYNQMP config TEGRA bool "NVIDIA Tegra" + imply DISTRO_DEFAULTS imply FAT_WRITE config TARGET_VEXPRESS64_AEMV8A @@ -1177,7 +1195,9 @@ config ARCH_ROCKCHIP select DM_PWM select DM_REGULATOR select ENABLE_ARM_SOC_BOOT0_HOOK + select SPI imply CMD_FASTBOOT + imply DISTRO_DEFAULTS imply FASTBOOT imply FAT_WRITE imply USB_FUNCTION_FASTBOOT @@ -1185,6 +1205,7 @@ config ARCH_ROCKCHIP imply TPL_SYSRESET imply ADC imply SARADC_ROCKCHIP + imply SYS_NS16550 config TARGET_THUNDERX_88XX bool "Support ThunderX 88xx" diff --git a/arch/arm/config.mk b/arch/arm/config.mk index 9c213b897c..b448ed0b3e 100644 --- a/arch/arm/config.mk +++ b/arch/arm/config.mk @@ -23,9 +23,8 @@ PLATFORM_RELFLAGS += $(call cc-option, -msoft-float) \ $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) # LLVM support -LLVMS_RELFLAGS := $(call cc-option,-mllvm,) \ - $(call cc-option,-target arm-none-eabi,) \ - $(call cc-option,-arm-use-movt=0,) +LLVM_RELFLAGS := $(call cc-option,-mllvm,) \ + $(call cc-option,-mno-movt,) PLATFORM_RELFLAGS += $(LLVM_RELFLAGS) PLATFORM_CPPFLAGS += -D__ARM__ diff --git a/arch/arm/cpu/arm1136/mx31/timer.c b/arch/arm/cpu/arm1136/mx31/timer.c index 3a81ce427c..ea9eca1dbf 100644 --- a/arch/arm/cpu/arm1136/mx31/timer.c +++ b/arch/arm/cpu/arm1136/mx31/timer.c @@ -23,8 +23,6 @@ #define GPTCR_CLKSOURCE_32 (4 << 6) /* Clock source */ #define GPTCR_TEN 1 /* Timer enable */ -DECLARE_GLOBAL_DATA_PTR; - /* The 32768Hz 32-bit timer overruns in 131072 seconds */ int timer_init(void) { diff --git a/arch/arm/cpu/arm1136/mx35/timer.c b/arch/arm/cpu/arm1136/mx35/timer.c index 4edf533e2a..c396e15ec0 100644 --- a/arch/arm/cpu/arm1136/mx35/timer.c +++ b/arch/arm/cpu/arm1136/mx35/timer.c @@ -12,8 +12,6 @@ #include <asm/arch/imx-regs.h> #include <asm/arch/crm_regs.h> -DECLARE_GLOBAL_DATA_PTR; - /* General purpose timers bitfields */ #define GPTCR_SWR (1<<15) /* Software reset */ #define GPTCR_FRR (1<<9) /* Freerun / restart */ diff --git a/arch/arm/cpu/armv8/Makefile b/arch/arm/cpu/armv8/Makefile index 1249547436..d18b38eb9e 100644 --- a/arch/arm/cpu/armv8/Makefile +++ b/arch/arm/cpu/armv8/Makefile @@ -9,7 +9,7 @@ extra-y := start.o obj-y += cpu.o ifndef CONFIG_$(SPL_TPL_)TIMER -obj-y += generic_timer.o +obj-$(CONFIG_SYS_ARCH_TIMER) += generic_timer.o endif obj-y += cache_v8.o obj-y += exceptions.o diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index c4a96d48ba..7edc06d202 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -167,6 +167,7 @@ config ARCH_LS2080A select SYS_I2C_MXC_I2C2 select SYS_I2C_MXC_I2C3 select SYS_I2C_MXC_I2C4 + imply DISTRO_DEFAULTS imply PANIC_HANG config FSL_LSCH2 diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index 18fb937a3a..2fdc0eb8d1 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@ -26,8 +26,6 @@ #endif #include <fsl_immap.h> -DECLARE_GLOBAL_DATA_PTR; - bool soc_has_dp_ddr(void) { struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR); diff --git a/arch/arm/cpu/armv8/s32v234/cpu.c b/arch/arm/cpu/armv8/s32v234/cpu.c index 5c97e0eee4..282cd02f59 100644 --- a/arch/arm/cpu/armv8/s32v234/cpu.c +++ b/arch/arm/cpu/armv8/s32v234/cpu.c @@ -12,8 +12,6 @@ #include <asm/arch/mc_me_regs.h> #include "cpu.h" -DECLARE_GLOBAL_DATA_PTR; - u32 cpu_mask(void) { return readl(MC_ME_CS); diff --git a/arch/arm/cpu/pxa/timer.c b/arch/arm/cpu/pxa/timer.c index 7c25e67fea..ba332716e8 100644 --- a/arch/arm/cpu/pxa/timer.c +++ b/arch/arm/cpu/pxa/timer.c @@ -9,8 +9,6 @@ #include <common.h> #include <asm/io.h> -DECLARE_GLOBAL_DATA_PTR; - int timer_init(void) { writel(0, CONFIG_SYS_TIMER_COUNTER); diff --git a/arch/arm/dts/r8a7790-lager-u-boot.dts b/arch/arm/dts/r8a7790-lager-u-boot.dts index a3f15777a6..a42d61c450 100644 --- a/arch/arm/dts/r8a7790-lager-u-boot.dts +++ b/arch/arm/dts/r8a7790-lager-u-boot.dts @@ -8,3 +8,7 @@ #include "r8a7790-lager.dts" #include "r8a7790-u-boot.dtsi" + +&scif0 { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/r8a7793-gose-u-boot.dts b/arch/arm/dts/r8a7793-gose-u-boot.dts index 0c16dde4c7..ed6f391c62 100644 --- a/arch/arm/dts/r8a7793-gose-u-boot.dts +++ b/arch/arm/dts/r8a7793-gose-u-boot.dts @@ -8,3 +8,7 @@ #include "r8a7793-gose.dts" #include "r8a7793-u-boot.dtsi" + +&scif0 { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/r8a7794-alt-u-boot.dts b/arch/arm/dts/r8a7794-alt-u-boot.dts index 8a14e46a7a..e179335d3a 100644 --- a/arch/arm/dts/r8a7794-alt-u-boot.dts +++ b/arch/arm/dts/r8a7794-alt-u-boot.dts @@ -8,3 +8,7 @@ #include "r8a7794-alt.dts" #include "r8a7794-u-boot.dtsi" + +&scif2 { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/rk3188-radxarock-u-boot.dtsi b/arch/arm/dts/rk3188-radxarock-u-boot.dtsi new file mode 100644 index 0000000000..26f5707bb8 --- /dev/null +++ b/arch/arm/dts/rk3188-radxarock-u-boot.dtsi @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +&cru { + u-boot,dm-spl; +}; + +&pinctrl { + u-boot,dm-spl; +}; + +&uart2 { + status = "okay"; + u-boot,dm-spl; +}; + +&timer3 { + compatible = "rockchip,rk3368-timer", "rockchip,rk3288-timer"; + u-boot,dm-spl; + clock-frequency = <24000000>; +}; diff --git a/arch/arm/dts/rk3188-radxarock.dts b/arch/arm/dts/rk3188-radxarock.dts index 5f5b5e9a1f..0fc4f54af2 100644 --- a/arch/arm/dts/rk3188-radxarock.dts +++ b/arch/arm/dts/rk3188-radxarock.dts @@ -7,6 +7,7 @@ /dts-v1/; #include <dt-bindings/input/input.h> #include "rk3188.dtsi" +#include "rk3188-radxarock-u-boot.dtsi" / { model = "Radxa Rock"; @@ -356,11 +357,6 @@ status = "okay"; }; -&uart2 { - status = "okay"; - u-boot,dm-spl; -}; - &uart3 { status = "okay"; }; diff --git a/arch/arm/dts/rk3188.dtsi b/arch/arm/dts/rk3188.dtsi index f4d438eb66..aeb5b80e14 100644 --- a/arch/arm/dts/rk3188.dtsi +++ b/arch/arm/dts/rk3188.dtsi @@ -105,7 +105,6 @@ compatible = "rockchip,rk3188-cru"; reg = <0x20000000 0x1000>; rockchip,grf = <&grf>; - u-boot,dm-spl; #clock-cells = <1>; #reset-cells = <1>; @@ -124,6 +123,12 @@ }; }; + timer3: timer@2000e000 { + compatible = "rockchip,rk3188-timer", "rockchip,rk3288-timer"; + reg = <0x2000e000 0x20>; + interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; + }; + usbphy: phy { compatible = "rockchip,rk3188-usb-phy", "rockchip,rk3288-usb-phy"; rockchip,grf = <&grf>; @@ -156,7 +161,6 @@ #address-cells = <1>; #size-cells = <1>; ranges; - u-boot,dm-spl; gpio0: gpio0@2000a000 { compatible = "rockchip,gpio-bank"; diff --git a/arch/arm/include/asm/arch-omap4/sys_proto.h b/arch/arm/include/asm/arch-omap4/sys_proto.h index c9f0b3a14b..c8298c57e1 100644 --- a/arch/arm/include/asm/arch-omap4/sys_proto.h +++ b/arch/arm/include/asm/arch-omap4/sys_proto.h @@ -16,8 +16,6 @@ #include <asm/arch/mux_omap4.h> #include <asm/ti-common/sys_proto.h> -DECLARE_GLOBAL_DATA_PTR; - #ifdef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS extern const struct emif_regs emif_regs_elpida_200_mhz_2cs; extern const struct emif_regs emif_regs_elpida_380_mhz_1cs; diff --git a/arch/arm/include/asm/arch-omap5/sys_proto.h b/arch/arm/include/asm/arch-omap5/sys_proto.h index d43cd7f2e7..e99bf77e83 100644 --- a/arch/arm/include/asm/arch-omap5/sys_proto.h +++ b/arch/arm/include/asm/arch-omap5/sys_proto.h @@ -16,8 +16,6 @@ #include <asm/arch/clock.h> #include <asm/ti-common/sys_proto.h> -DECLARE_GLOBAL_DATA_PTR; - /* * Structure for Iodelay configuration registers. * Theoretical max for g_delay is 21560 ps. diff --git a/arch/arm/lib/cmd_boot.c b/arch/arm/lib/cmd_boot.c index 37bb6a567e..781a6eaf52 100644 --- a/arch/arm/lib/cmd_boot.c +++ b/arch/arm/lib/cmd_boot.c @@ -21,8 +21,6 @@ #include <common.h> #include <command.h> -DECLARE_GLOBAL_DATA_PTR; - /* * ARMv7M does not support ARM instruction mode. However, the * interworking BLX and BX instructions do encode the ARM/Thumb diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 3621dfa760..1a6ed211e5 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -88,6 +88,7 @@ config TARGET_GURNARD select DM_SPI select DM_GPIO select DM_ETH + select SPI config TARGET_AT91SAM9261EK bool "Atmel at91sam9261 reference board" @@ -202,6 +203,7 @@ config TARGET_MA5D4EVK select SUPPORT_SPL select DM select DM_SPI + select SPI config TARGET_MEESC bool "Support meesc" @@ -225,6 +227,7 @@ config TARGET_TAURUS select DM_SPI select DM_GPIO select DM_ETH + select SPI config TARGET_SMARTWEB bool "Support smartweb" @@ -241,6 +244,7 @@ config TARGET_VINCO select SUPPORT_SPL select DM select DM_SPI + select SPI config TARGET_WB45N bool "Support Laird WB45N" diff --git a/arch/arm/mach-at91/spl_atmel.c b/arch/arm/mach-at91/spl_atmel.c index ce16ef3bdb..ae008d5501 100644 --- a/arch/arm/mach-at91/spl_atmel.c +++ b/arch/arm/mach-at91/spl_atmel.c @@ -15,8 +15,6 @@ #include <asm/arch/clk.h> #include <spl.h> -DECLARE_GLOBAL_DATA_PTR; - static void switch_to_main_crystal_osc(void) { struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; diff --git a/arch/arm/mach-davinci/spl.c b/arch/arm/mach-davinci/spl.c index 4c74db9ed0..f455316002 100644 --- a/arch/arm/mach-davinci/spl.c +++ b/arch/arm/mach-davinci/spl.c @@ -16,8 +16,6 @@ #include <spi_flash.h> #include <mmc.h> -DECLARE_GLOBAL_DATA_PTR; - #ifndef CONFIG_SPL_LIBCOMMON_SUPPORT void puts(const char *str) { diff --git a/arch/arm/mach-exynos/clock_init_exynos5.c b/arch/arm/mach-exynos/clock_init_exynos5.c index 1b7498d9d5..2c55e4031f 100644 --- a/arch/arm/mach-exynos/clock_init_exynos5.c +++ b/arch/arm/mach-exynos/clock_init_exynos5.c @@ -21,8 +21,6 @@ #define FSYS1_MMC0_DIV_MASK 0xff0f #define FSYS1_MMC0_DIV_VAL 0x0701 -DECLARE_GLOBAL_DATA_PTR; - struct arm_clk_ratios arm_clk_ratios[] = { #ifdef CONFIG_EXYNOS5420 { diff --git a/arch/arm/mach-exynos/mmu-arm64.c b/arch/arm/mach-exynos/mmu-arm64.c index 23814222d8..e0dd94ce24 100644 --- a/arch/arm/mach-exynos/mmu-arm64.c +++ b/arch/arm/mach-exynos/mmu-arm64.c @@ -8,8 +8,6 @@ #include <common.h> #include <asm/armv8/mmu.h> -DECLARE_GLOBAL_DATA_PTR; - #ifdef CONFIG_EXYNOS7420 static struct mm_region exynos7420_mem_map[] = { { diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c index ada8adf2f4..62cd56e096 100644 --- a/arch/arm/mach-imx/cmd_dek.c +++ b/arch/arm/mach-imx/cmd_dek.c @@ -16,8 +16,6 @@ #include <asm/arch/clock.h> #include <mapmem.h> -DECLARE_GLOBAL_DATA_PTR; - /** * blob_dek() - Encapsulate the DEK as a blob using CAM's Key * @src: - Address of data to be encapsulated diff --git a/arch/arm/mach-imx/mx7ulp/Kconfig b/arch/arm/mach-imx/mx7ulp/Kconfig index 1bdc85a9a0..d4b0299dbd 100644 --- a/arch/arm/mach-imx/mx7ulp/Kconfig +++ b/arch/arm/mach-imx/mx7ulp/Kconfig @@ -9,6 +9,7 @@ choice config TARGET_MX7ULP_EVK bool "Support mx7ulp EVK board" + select SYS_ARCH_TIMER endchoice diff --git a/arch/arm/mach-imx/mx7ulp/pcc.c b/arch/arm/mach-imx/mx7ulp/pcc.c index edd84e51b9..1d39c5b1ee 100644 --- a/arch/arm/mach-imx/mx7ulp/pcc.c +++ b/arch/arm/mach-imx/mx7ulp/pcc.c @@ -12,8 +12,6 @@ #include <asm/arch/pcc.h> #include <asm/arch/sys_proto.h> -DECLARE_GLOBAL_DATA_PTR; - #define PCC_CLKSRC_TYPES 2 #define PCC_CLKSRC_NUM 7 diff --git a/arch/arm/mach-imx/mx7ulp/scg.c b/arch/arm/mach-imx/mx7ulp/scg.c index c117af0a0e..341f8cc119 100644 --- a/arch/arm/mach-imx/mx7ulp/scg.c +++ b/arch/arm/mach-imx/mx7ulp/scg.c @@ -12,8 +12,6 @@ #include <asm/arch/pcc.h> #include <asm/arch/sys_proto.h> -DECLARE_GLOBAL_DATA_PTR; - scg_p scg1_regs = (scg_p)SCG1_RBASE; static u32 scg_src_get_rate(enum scg_clk clksrc) diff --git a/arch/arm/mach-imx/mx8m/clock.c b/arch/arm/mach-imx/mx8m/clock.c index c56ba99d5c..0481117343 100644 --- a/arch/arm/mach-imx/mx8m/clock.c +++ b/arch/arm/mach-imx/mx8m/clock.c @@ -14,8 +14,6 @@ #include <errno.h> #include <linux/iopoll.h> -DECLARE_GLOBAL_DATA_PTR; - static struct anamix_pll *ana_pll = (struct anamix_pll *)ANATOP_BASE_ADDR; static u32 decode_frac_pll(enum clk_root_src frac_pll) diff --git a/arch/arm/mach-imx/mx8m/clock_slice.c b/arch/arm/mach-imx/mx8m/clock_slice.c index e734498b94..b851d59c13 100644 --- a/arch/arm/mach-imx/mx8m/clock_slice.c +++ b/arch/arm/mach-imx/mx8m/clock_slice.c @@ -12,8 +12,6 @@ #include <asm/io.h> #include <errno.h> -DECLARE_GLOBAL_DATA_PTR; - static struct ccm_reg *ccm_reg = (struct ccm_reg *)CCM_BASE_ADDR; static struct clk_root_map root_array[] = { diff --git a/arch/arm/mach-imx/timer.c b/arch/arm/mach-imx/timer.c index 69dbf3c2ce..60f706fbe3 100644 --- a/arch/arm/mach-imx/timer.c +++ b/arch/arm/mach-imx/timer.c @@ -38,8 +38,6 @@ static struct mxc_gpt *cur_gpt = (struct mxc_gpt *)GPT1_BASE_ADDR; #define GPTPR_PRESCALER24M_SHIFT 12 #define GPTPR_PRESCALER24M_MASK (0xF << GPTPR_PRESCALER24M_SHIFT) -DECLARE_GLOBAL_DATA_PTR; - static inline int gpt_has_clk_source_osc(void) { #if defined(CONFIG_MX6) diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c index ab4164cbe0..37ef13484c 100644 --- a/arch/arm/mach-mvebu/armada3700/cpu.c +++ b/arch/arm/mach-mvebu/armada3700/cpu.c @@ -14,8 +14,6 @@ #include <asm/arch/soc.h> #include <asm/armv8/mmu.h> -DECLARE_GLOBAL_DATA_PTR; - /* Armada 3700 */ #define MVEBU_GPIO_NB_REG_BASE (MVEBU_REGISTER(0x13800)) diff --git a/arch/arm/mach-mvebu/armada8k/cpu.c b/arch/arm/mach-mvebu/armada8k/cpu.c index ce7e913b70..2b3419be03 100644 --- a/arch/arm/mach-mvebu/armada8k/cpu.c +++ b/arch/arm/mach-mvebu/armada8k/cpu.c @@ -14,8 +14,6 @@ #include <asm/arch/soc.h> #include <asm/armv8/mmu.h> -DECLARE_GLOBAL_DATA_PTR; - /* Armada 7k/8k */ #define MVEBU_RFU_BASE (MVEBU_REGISTER(0x6f0000)) #define RFU_GLOBAL_SW_RST (MVEBU_RFU_BASE + 0x84) diff --git a/arch/arm/mach-mvebu/sata.c b/arch/arm/mach-mvebu/sata.c index 5d8032bd89..526c4a61ef 100644 --- a/arch/arm/mach-mvebu/sata.c +++ b/arch/arm/mach-mvebu/sata.c @@ -8,8 +8,6 @@ #include <ahci.h> #include <dm.h> -DECLARE_GLOBAL_DATA_PTR; - /* * Dummy implementation that can be overwritten by a board * specific function diff --git a/arch/arm/mach-mvebu/timer.c b/arch/arm/mach-mvebu/timer.c index f5c2eaa808..a86128e871 100644 --- a/arch/arm/mach-mvebu/timer.c +++ b/arch/arm/mach-mvebu/timer.c @@ -11,8 +11,6 @@ #include <asm/io.h> #include <asm/arch/soc.h> -DECLARE_GLOBAL_DATA_PTR; - #define TIMER_LOAD_VAL 0xffffffff static int init_done __attribute__((section(".data"))) = 0; diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c index db68a9d7e2..f9ab5da723 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -196,9 +196,10 @@ u32 spl_boot_mode(const u32 boot_device) void spl_board_init(void) { +#ifdef CONFIG_SPL_SERIAL_SUPPORT /* Prepare console output */ preloader_console_init(); - +#endif #if defined(CONFIG_SPL_NAND_SUPPORT) || defined(CONFIG_SPL_ONENAND_SUPPORT) gpmc_init(); #endif diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c index a61b933145..b4c9af1290 100644 --- a/arch/arm/mach-omap2/omap3/board.c +++ b/arch/arm/mach-omap2/omap3/board.c @@ -28,8 +28,6 @@ #include <asm/omap_common.h> #include <linux/compiler.h> -DECLARE_GLOBAL_DATA_PTR; - /* Declarations */ extern omap3_sysinfo sysinfo; #ifndef CONFIG_SYS_L2CACHE_OFF diff --git a/arch/arm/mach-omap2/omap4/hwinit.c b/arch/arm/mach-omap2/omap4/hwinit.c index 67ab1ccd75..4bda162903 100644 --- a/arch/arm/mach-omap2/omap4/hwinit.c +++ b/arch/arm/mach-omap2/omap4/hwinit.c @@ -21,8 +21,6 @@ #include <asm/arch/gpio.h> #include <asm/omap_common.h> -DECLARE_GLOBAL_DATA_PTR; - u32 *const omap_si_rev = (u32 *)OMAP_SRAM_SCRATCH_OMAP_REV; static const struct gpio_bank gpio_bank_44xx[6] = { diff --git a/arch/arm/mach-omap2/omap5/hwinit.c b/arch/arm/mach-omap2/omap5/hwinit.c index 57f2a8664c..e7a3f57b67 100644 --- a/arch/arm/mach-omap2/omap5/hwinit.c +++ b/arch/arm/mach-omap2/omap5/hwinit.c @@ -24,8 +24,6 @@ #include <asm/emif.h> #include <asm/omap_common.h> -DECLARE_GLOBAL_DATA_PTR; - u32 *const omap_si_rev = (u32 *)OMAP_SRAM_SCRATCH_OMAP_REV; #ifndef CONFIG_DM_GPIO diff --git a/arch/arm/mach-qemu/Kconfig b/arch/arm/mach-qemu/Kconfig index 133163aecf..226dfa362f 100644 --- a/arch/arm/mach-qemu/Kconfig +++ b/arch/arm/mach-qemu/Kconfig @@ -16,6 +16,7 @@ config TARGET_QEMU_ARM_32BIT depends on ARCH_QEMU select CPU_V7 select ARCH_SUPPORT_PSCI + select SYS_ARCH_TIMER config TARGET_QEMU_ARM_64BIT bool "Support qemu_arm64" diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-rmobile/Kconfig.32 index a8835f6571..84c1a6d07b 100644 --- a/arch/arm/mach-rmobile/Kconfig.32 +++ b/arch/arm/mach-rmobile/Kconfig.32 @@ -42,6 +42,9 @@ config TARGET_GOSE bool "Gose board" select DM select DM_SERIAL + select SUPPORT_SPL + select USE_TINY_PRINTF + select SPL_TINY_MEMSET config TARGET_KOELSCH bool "Koelsch board" @@ -55,6 +58,9 @@ config TARGET_LAGER bool "Lager board" select DM select DM_SERIAL + select SUPPORT_SPL + select USE_TINY_PRINTF + select SPL_TINY_MEMSET config TARGET_KZM9G bool "KZM9D board" @@ -63,6 +69,9 @@ config TARGET_ALT bool "Alt board" select DM select DM_SERIAL + select SUPPORT_SPL + select USE_TINY_PRINTF + select SPL_TINY_MEMSET config TARGET_SILK bool "Silk board" diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 0adaed4367..007cb22a34 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -103,7 +103,6 @@ config ROCKCHIP_RK3368 imply SPL_SERIAL_SUPPORT imply TPL_SERIAL_SUPPORT select DEBUG_UART_BOARD_INIT - select SYS_NS16550 help The Rockchip RK3368 is a ARM-based SoC with a octa-core (organised into a big and little cluster with 4 cores each) Cortex-A53 including diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile index e1b0519b1f..096dbac25b 100644 --- a/arch/arm/mach-rockchip/Makefile +++ b/arch/arm/mach-rockchip/Makefile @@ -40,8 +40,10 @@ endif obj-$(CONFIG_$(SPL_TPL_)RAM) += sdram_common.o ifndef CONFIG_ARM64 +ifndef CONFIG_ROCKCHIP_RK3188 obj-y += rk_timer.o endif +endif obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036/ obj-$(CONFIG_ROCKCHIP_RK3128) += rk3128/ diff --git a/arch/arm/mach-rockchip/make_fit_atf.py b/arch/arm/mach-rockchip/make_fit_atf.py index 7c6dd57678..9a404d1d32 100755 --- a/arch/arm/mach-rockchip/make_fit_atf.py +++ b/arch/arm/mach-rockchip/make_fit_atf.py @@ -13,8 +13,6 @@ import getopt # pip install pyelftools from elftools.elf.elffile import ELFFile -from elftools.elf.sections import SymbolTableSection -from elftools.elf.segments import Segment, InterpSegment, NoteSegment ELF_SEG_P_TYPE='p_type' ELF_SEG_P_PADDR='p_paddr' diff --git a/arch/arm/mach-rockchip/rk3036-board-spl.c b/arch/arm/mach-rockchip/rk3036-board-spl.c index 550e3a1521..4501cd17e3 100644 --- a/arch/arm/mach-rockchip/rk3036-board-spl.c +++ b/arch/arm/mach-rockchip/rk3036-board-spl.c @@ -14,8 +14,6 @@ #include <asm/arch/timer.h> #include <asm/arch/uart.h> -DECLARE_GLOBAL_DATA_PTR; - #define GRF_BASE 0x20008000 #define DEBUG_UART_BASE 0x20068000 diff --git a/arch/arm/mach-rockchip/rk3188-board-spl.c b/arch/arm/mach-rockchip/rk3188-board-spl.c index 74771d3a0b..3ccc4f1205 100644 --- a/arch/arm/mach-rockchip/rk3188-board-spl.c +++ b/arch/arm/mach-rockchip/rk3188-board-spl.c @@ -131,8 +131,6 @@ void board_init_f(ulong dummy) hang(); } - rockchip_timer_init(); - ret = rockchip_get_clk(&dev); if (ret) { debug("CLK init failed: %d\n", ret); diff --git a/arch/arm/mach-rockchip/rk3188-board.c b/arch/arm/mach-rockchip/rk3188-board.c index 916d18fc32..9005705db1 100644 --- a/arch/arm/mach-rockchip/rk3188-board.c +++ b/arch/arm/mach-rockchip/rk3188-board.c @@ -18,8 +18,6 @@ #include <asm/gpio.h> #include <dm/pinctrl.h> -DECLARE_GLOBAL_DATA_PTR; - int board_late_init(void) { struct rk3188_grf *grf; diff --git a/arch/arm/mach-rockchip/rk322x-board-spl.c b/arch/arm/mach-rockchip/rk322x-board-spl.c index 206abfafcd..4d8e8bdeb2 100644 --- a/arch/arm/mach-rockchip/rk322x-board-spl.c +++ b/arch/arm/mach-rockchip/rk322x-board-spl.c @@ -21,8 +21,6 @@ u32 spl_boot_device(void) { return BOOT_DEVICE_MMC1; } -DECLARE_GLOBAL_DATA_PTR; - #define GRF_BASE 0x11000000 #define SGRF_BASE 0x10140000 @@ -95,7 +93,7 @@ void board_init_f(ulong dummy) /* Disable the ddr secure region setting to make it non-secure */ rk_clrreg(SGRF_DDR_CON0, 0x4000); -#if defined(CONFIG_ROCKCHIP_SPL_BACK_TO_BROM) && !defined(CONFIG_SPL_BOARD_INIT) +#if defined(CONFIG_SPL_ROCKCHIP_BACK_TO_BROM) && !defined(CONFIG_SPL_BOARD_INIT) back_to_bootrom(BROM_BOOT_NEXTSTAGE); #endif } diff --git a/arch/arm/mach-rockchip/rk3288-board-tpl.c b/arch/arm/mach-rockchip/rk3288-board-tpl.c index 150beea02e..6f7097dbdb 100644 --- a/arch/arm/mach-rockchip/rk3288-board-tpl.c +++ b/arch/arm/mach-rockchip/rk3288-board-tpl.c @@ -19,8 +19,6 @@ #include <asm/arch/sys_proto.h> #include <asm/arch/timer.h> -DECLARE_GLOBAL_DATA_PTR; - #define GRF_BASE 0xff770000 void board_init_f(ulong dummy) { diff --git a/arch/arm/mach-rockchip/rk3368-board-spl.c b/arch/arm/mach-rockchip/rk3368-board-spl.c index 8055ae538f..a1d504bbd2 100644 --- a/arch/arm/mach-rockchip/rk3368-board-spl.c +++ b/arch/arm/mach-rockchip/rk3368-board-spl.c @@ -17,8 +17,6 @@ #include <asm/arch/periph.h> #include <asm/arch/timer.h> -DECLARE_GLOBAL_DATA_PTR; - void board_debug_uart_init(void) { } diff --git a/arch/arm/mach-rockchip/rk3368-board-tpl.c b/arch/arm/mach-rockchip/rk3368-board-tpl.c index 60d5aeade9..f5bc0d4cd5 100644 --- a/arch/arm/mach-rockchip/rk3368-board-tpl.c +++ b/arch/arm/mach-rockchip/rk3368-board-tpl.c @@ -18,8 +18,6 @@ #include <asm/arch/timer.h> #include <syscon.h> -DECLARE_GLOBAL_DATA_PTR; - /* * The SPL (and also the full U-Boot stage on the RK3368) will run in * secure mode (i.e. EL3) and an ATF will eventually be booted before diff --git a/arch/arm/mach-rockchip/rk3399-board-spl.c b/arch/arm/mach-rockchip/rk3399-board-spl.c index d35990efd6..4eb7f01c15 100644 --- a/arch/arm/mach-rockchip/rk3399-board-spl.c +++ b/arch/arm/mach-rockchip/rk3399-board-spl.c @@ -19,8 +19,6 @@ #include <spl.h> #include <syscon.h> -DECLARE_GLOBAL_DATA_PTR; - void board_return_to_bootrom(void) { back_to_bootrom(BROM_BOOT_NEXTSTAGE); diff --git a/arch/arm/mach-socfpga/clock_manager_arria10.c b/arch/arm/mach-socfpga/clock_manager_arria10.c index 623a266f80..4bc4acb9bf 100644 --- a/arch/arm/mach-socfpga/clock_manager_arria10.c +++ b/arch/arm/mach-socfpga/clock_manager_arria10.c @@ -10,8 +10,6 @@ #include <dm.h> #include <asm/arch/clock_manager.h> -DECLARE_GLOBAL_DATA_PTR; - static u32 eosc1_hz; static u32 cb_intosc_hz; static u32 f2s_free_hz; diff --git a/arch/arm/mach-socfpga/clock_manager_gen5.c b/arch/arm/mach-socfpga/clock_manager_gen5.c index 4e5b6d1693..1b3914ba7d 100644 --- a/arch/arm/mach-socfpga/clock_manager_gen5.c +++ b/arch/arm/mach-socfpga/clock_manager_gen5.c @@ -10,8 +10,6 @@ #include <asm/arch/clock_manager.h> #include <wait_bit.h> -DECLARE_GLOBAL_DATA_PTR; - static const struct socfpga_clock_manager *clock_manager_base = (struct socfpga_clock_manager *)SOCFPGA_CLKMGR_ADDRESS; diff --git a/arch/arm/mach-socfpga/fpga_manager.c b/arch/arm/mach-socfpga/fpga_manager.c index f9095739b0..16e4a7821b 100644 --- a/arch/arm/mach-socfpga/fpga_manager.c +++ b/arch/arm/mach-socfpga/fpga_manager.c @@ -15,8 +15,6 @@ #include <asm/arch/reset_manager.h> #include <asm/arch/system_manager.h> -DECLARE_GLOBAL_DATA_PTR; - /* Timeout count */ #define FPGA_TIMEOUT_CNT 0x1000000 diff --git a/arch/arm/mach-socfpga/freeze_controller.c b/arch/arm/mach-socfpga/freeze_controller.c index 71d5d99e9c..62fa854082 100644 --- a/arch/arm/mach-socfpga/freeze_controller.c +++ b/arch/arm/mach-socfpga/freeze_controller.c @@ -11,8 +11,6 @@ #include <asm/arch/freeze_controller.h> #include <linux/errno.h> -DECLARE_GLOBAL_DATA_PTR; - static const struct socfpga_freeze_controller *freeze_controller_base = (void *)(SOCFPGA_SYSMGR_ADDRESS + SYSMGR_FRZCTRL_ADDRESS); diff --git a/arch/arm/mach-socfpga/misc_arria10.c b/arch/arm/mach-socfpga/misc_arria10.c index 9d751f6b2f..475fd59a45 100644 --- a/arch/arm/mach-socfpga/misc_arria10.c +++ b/arch/arm/mach-socfpga/misc_arria10.c @@ -28,8 +28,6 @@ #define PINMUX_UART1_TX_SHARED_IO_OFFSET_Q3_7 0x78 #define PINMUX_UART1_TX_SHARED_IO_OFFSET_Q4_3 0x98 -DECLARE_GLOBAL_DATA_PTR; - #if defined(CONFIG_SPL_BUILD) static struct pl310_regs *const pl310 = (struct pl310_regs *)CONFIG_SYS_PL310_BASE; diff --git a/arch/arm/mach-socfpga/reset_manager.c b/arch/arm/mach-socfpga/reset_manager.c index 29438ed533..484b295cd3 100644 --- a/arch/arm/mach-socfpga/reset_manager.c +++ b/arch/arm/mach-socfpga/reset_manager.c @@ -9,8 +9,6 @@ #include <asm/io.h> #include <asm/arch/reset_manager.h> -DECLARE_GLOBAL_DATA_PTR; - static const struct socfpga_reset_manager *reset_manager_base = (void *)SOCFPGA_RSTMGR_ADDRESS; diff --git a/arch/arm/mach-socfpga/reset_manager_gen5.c b/arch/arm/mach-socfpga/reset_manager_gen5.c index aa88adb414..c59127456c 100644 --- a/arch/arm/mach-socfpga/reset_manager_gen5.c +++ b/arch/arm/mach-socfpga/reset_manager_gen5.c @@ -11,8 +11,6 @@ #include <asm/arch/reset_manager.h> #include <asm/arch/system_manager.h> -DECLARE_GLOBAL_DATA_PTR; - static const struct socfpga_reset_manager *reset_manager_base = (void *)SOCFPGA_RSTMGR_ADDRESS; static const struct socfpga_system_manager *sysmgr_regs = diff --git a/arch/arm/mach-socfpga/scan_manager.c b/arch/arm/mach-socfpga/scan_manager.c index 566b33f2b6..8b271b1f45 100644 --- a/arch/arm/mach-socfpga/scan_manager.c +++ b/arch/arm/mach-socfpga/scan_manager.c @@ -28,8 +28,6 @@ #define SCANMGR_STAT_ACTIVE (1 << 31) #define SCANMGR_STAT_WFIFOCNT_MASK 0x70000000 -DECLARE_GLOBAL_DATA_PTR; - static const struct socfpga_scan_manager *scan_manager_base = (void *)(SOCFPGA_SCANMGR_ADDRESS); static const struct socfpga_freeze_controller *freeze_controller_base = diff --git a/arch/arm/mach-socfpga/system_manager_gen5.c b/arch/arm/mach-socfpga/system_manager_gen5.c index 3588a570a7..e0af7753b0 100644 --- a/arch/arm/mach-socfpga/system_manager_gen5.c +++ b/arch/arm/mach-socfpga/system_manager_gen5.c @@ -9,8 +9,6 @@ #include <asm/arch/system_manager.h> #include <asm/arch/fpga_manager.h> -DECLARE_GLOBAL_DATA_PTR; - static struct socfpga_system_manager *sysmgr_regs = (struct socfpga_system_manager *)SOCFPGA_SYSMGR_ADDRESS; diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig index 8ca97bf0c9..4d59480c19 100644 --- a/arch/arm/mach-stm32mp/Kconfig +++ b/arch/arm/mach-stm32mp/Kconfig @@ -27,6 +27,7 @@ config TARGET_STM32MP1 select CPU_V7 select PINCTRL_STM32 select STM32_RESET + select SYS_ARCH_TIMER select SYSRESET_SYSCON help target STMicroelectronics SOC STM32MP1 family diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index 1753faec1d..ac456ca0c6 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -209,7 +209,6 @@ void s_init(void) } #ifdef CONFIG_SPL_BUILD -DECLARE_GLOBAL_DATA_PTR; #endif /* The sunxi internal brom will try to loader external bootloader diff --git a/arch/arm/mach-sunxi/dram_sun9i.c b/arch/arm/mach-sunxi/dram_sun9i.c index 8c681f3541..e7d423f861 100644 --- a/arch/arm/mach-sunxi/dram_sun9i.c +++ b/arch/arm/mach-sunxi/dram_sun9i.c @@ -20,8 +20,6 @@ #include <asm/arch/dram.h> #include <asm/arch/sys_proto.h> -DECLARE_GLOBAL_DATA_PTR; - #define DRAM_CLK (CONFIG_DRAM_CLK * 1000000) /* diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index fd0082d22a..5fa3e6b6ad 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -35,6 +35,7 @@ config TEGRA_COMMON select DM_SPI select DM_SPI_FLASH select MISC + select SPI select OF_CONTROL select VIDCONSOLE_AS_LCD if DM_VIDEO select BOARD_EARLY_INIT_F diff --git a/arch/arm/mach-tegra/board186.c b/arch/arm/mach-tegra/board186.c index 691c3fd98d..9e95123c55 100644 --- a/arch/arm/mach-tegra/board186.c +++ b/arch/arm/mach-tegra/board186.c @@ -7,8 +7,6 @@ #include <common.h> #include <asm/arch/tegra.h> -DECLARE_GLOBAL_DATA_PTR; - int board_early_init_f(void) { return 0; diff --git a/arch/arm/mach-tegra/tegra186/nvtboot_board.c b/arch/arm/mach-tegra/tegra186/nvtboot_board.c index 8ecb454443..bef3ce8fc8 100644 --- a/arch/arm/mach-tegra/tegra186/nvtboot_board.c +++ b/arch/arm/mach-tegra/tegra186/nvtboot_board.c @@ -11,8 +11,6 @@ #include <asm/arch/tegra.h> #include <asm/armv8/mmu.h> -DECLARE_GLOBAL_DATA_PTR; - extern unsigned long nvtboot_boot_x0; /* diff --git a/arch/arm/mach-zynq/ddrc.c b/arch/arm/mach-zynq/ddrc.c index 047a7b4d9c..795e2bd003 100644 --- a/arch/arm/mach-zynq/ddrc.c +++ b/arch/arm/mach-zynq/ddrc.c @@ -10,8 +10,6 @@ #include <asm/arch/sys_proto.h> #include <asm/arch/hardware.h> -DECLARE_GLOBAL_DATA_PTR; - #ifndef CONFIG_ZYNQ_DDRC_INIT void zynq_ddrc_init(void) {} #else diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c index 0a303f41eb..d1e61aab11 100644 --- a/arch/arm/mach-zynq/spl.c +++ b/arch/arm/mach-zynq/spl.c @@ -13,8 +13,6 @@ #include <asm/arch/sys_proto.h> #include <asm/arch/ps7_init_gpl.h> -DECLARE_GLOBAL_DATA_PTR; - void board_init_f(ulong dummy) { ps7_init(); diff --git a/arch/microblaze/cpu/spl.c b/arch/microblaze/cpu/spl.c index 3d57a5a859..3407e36c5c 100644 --- a/arch/microblaze/cpu/spl.c +++ b/arch/microblaze/cpu/spl.c @@ -12,8 +12,6 @@ #include <asm/io.h> #include <asm/u-boot.h> -DECLARE_GLOBAL_DATA_PTR; - bool boot_linux; u32 spl_boot_device(void) diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c index 154671d480..0be72f5433 100644 --- a/arch/microblaze/lib/bootm.c +++ b/arch/microblaze/lib/bootm.c @@ -15,8 +15,6 @@ #include <u-boot/zlib.h> #include <asm/byteorder.h> -DECLARE_GLOBAL_DATA_PTR; - int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *images) { diff --git a/arch/mips/mach-ath79/ar933x/ddr.c b/arch/mips/mach-ath79/ar933x/ddr.c index 2a25e23869..eeaf4aec4d 100644 --- a/arch/mips/mach-ath79/ar933x/ddr.c +++ b/arch/mips/mach-ath79/ar933x/ddr.c @@ -12,8 +12,6 @@ #include <mach/ar71xx_regs.h> #include <mach/ath79.h> -DECLARE_GLOBAL_DATA_PTR; - #define DDR_CTRL_UPD_EMR3S BIT(5) #define DDR_CTRL_UPD_EMR2S BIT(4) #define DDR_CTRL_PRECHARGE BIT(3) diff --git a/arch/mips/mach-ath79/qca953x/ddr.c b/arch/mips/mach-ath79/qca953x/ddr.c index c6049d8958..92d591c2a6 100644 --- a/arch/mips/mach-ath79/qca953x/ddr.c +++ b/arch/mips/mach-ath79/qca953x/ddr.c @@ -12,8 +12,6 @@ #include <mach/ar71xx_regs.h> #include <mach/ath79.h> -DECLARE_GLOBAL_DATA_PTR; - #define DDR_CTRL_UPD_EMR3S BIT(5) #define DDR_CTRL_UPD_EMR2S BIT(4) #define DDR_CTRL_PRECHARGE BIT(3) diff --git a/arch/nds32/lib/boot.c b/arch/nds32/lib/boot.c index f9c1c6b3ff..1313506ed5 100644 --- a/arch/nds32/lib/boot.c +++ b/arch/nds32/lib/boot.c @@ -9,8 +9,6 @@ #include <common.h> #include <command.h> -DECLARE_GLOBAL_DATA_PTR; - unsigned long do_go_exec(ulong (*entry)(int, char * const []), int argc, char * const argv[]) { diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index b350bfeb06..99abb6786c 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -54,8 +54,6 @@ #include <fsl_qe.h> #endif -DECLARE_GLOBAL_DATA_PTR; - #ifdef CONFIG_SYS_FSL_SINGLE_SOURCE_CLK /* * For deriving usb clock from 100MHz sysclk, reference divisor is set diff --git a/arch/powerpc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c index 948ad8fa1c..4bd36b6886 100644 --- a/arch/powerpc/cpu/mpc86xx/fdt.c +++ b/arch/powerpc/cpu/mpc86xx/fdt.c @@ -9,8 +9,6 @@ #include <fdt_support.h> #include <asm/mp.h> -DECLARE_GLOBAL_DATA_PTR; - extern void ft_fixup_num_cores(void *blob); extern void ft_srio_setup(void *blob); diff --git a/arch/powerpc/lib/extable.c b/arch/powerpc/lib/extable.c index ed047da452..2f8b9326f9 100644 --- a/arch/powerpc/lib/extable.c +++ b/arch/powerpc/lib/extable.c @@ -21,8 +21,6 @@ * on our cache or tlb entries. */ -DECLARE_GLOBAL_DATA_PTR; - struct exception_table_entry { unsigned long insn, fixup; diff --git a/arch/powerpc/lib/kgdb.c b/arch/powerpc/lib/kgdb.c index aa16a00a42..f580c023e5 100644 --- a/arch/powerpc/lib/kgdb.c +++ b/arch/powerpc/lib/kgdb.c @@ -52,7 +52,7 @@ static struct hard_trap_info { 0x300, SIGSEGV }, /* address error (store) */ { 0x400, SIGBUS }, /* instruction bus error */ { 0x500, SIGINT }, /* interrupt */ - { 0x600, SIGBUS }, /* alingment */ + { 0x600, SIGBUS }, /* alignment */ { 0x700, SIGTRAP }, /* breakpoint trap */ { 0x800, SIGFPE }, /* fpu unavail */ { 0x900, SIGALRM }, /* decrementer */ diff --git a/arch/powerpc/lib/spl.c b/arch/powerpc/lib/spl.c index b93197030e..bc477175af 100644 --- a/arch/powerpc/lib/spl.c +++ b/arch/powerpc/lib/spl.c @@ -9,8 +9,6 @@ #include <image.h> #include <linux/compiler.h> -DECLARE_GLOBAL_DATA_PTR; - /* * This function jumps to an image with argument. Normally an FDT or ATAGS * image. diff --git a/arch/riscv/lib/boot.c b/arch/riscv/lib/boot.c index 39ba9b49ff..ffad66d683 100644 --- a/arch/riscv/lib/boot.c +++ b/arch/riscv/lib/boot.c @@ -8,8 +8,6 @@ #include <common.h> #include <command.h> -DECLARE_GLOBAL_DATA_PTR; - unsigned long do_go_exec(ulong (*entry)(int, char * const []), int argc, char * const argv[]) { diff --git a/arch/sandbox/lib/bootm.c b/arch/sandbox/lib/bootm.c index 0c9a7979d2..c7226ff30d 100644 --- a/arch/sandbox/lib/bootm.c +++ b/arch/sandbox/lib/bootm.c @@ -7,8 +7,6 @@ #include <common.h> #include <asm/io.h> -DECLARE_GLOBAL_DATA_PTR; - #define LINUX_ARM_ZIMAGE_MAGIC 0x016f2818 struct arm_z_header { diff --git a/arch/x86/cpu/pci.c b/arch/x86/cpu/pci.c index c9c7637fa7..2728c00227 100644 --- a/arch/x86/cpu/pci.c +++ b/arch/x86/cpu/pci.c @@ -17,8 +17,6 @@ #include <asm/io.h> #include <asm/pci.h> -DECLARE_GLOBAL_DATA_PTR; - int pci_x86_read_config(struct udevice *bus, pci_dev_t bdf, uint offset, ulong *valuep, enum pci_size_t size) { diff --git a/arch/x86/cpu/qemu/cpu.c b/arch/x86/cpu/qemu/cpu.c index b1a965e715..b53630b099 100644 --- a/arch/x86/cpu/qemu/cpu.c +++ b/arch/x86/cpu/qemu/cpu.c @@ -11,8 +11,6 @@ #include <qfw.h> #include <asm/cpu.h> -DECLARE_GLOBAL_DATA_PTR; - int cpu_qemu_get_desc(struct udevice *dev, char *buf, int size) { if (size < CPU_MAX_NAME_LEN) diff --git a/arch/x86/cpu/tangier/tangier.c b/arch/x86/cpu/tangier/tangier.c index 20d6c6039b..ac8733c75e 100644 --- a/arch/x86/cpu/tangier/tangier.c +++ b/arch/x86/cpu/tangier/tangier.c @@ -8,8 +8,6 @@ #include <asm/scu.h> #include <asm/u-boot-x86.h> -DECLARE_GLOBAL_DATA_PTR; - /* * Miscellaneous platform dependent initializations */ diff --git a/arch/x86/cpu/x86_64/cpu.c b/arch/x86/cpu/x86_64/cpu.c index cafae15af0..693d1a31f3 100644 --- a/arch/x86/cpu/x86_64/cpu.c +++ b/arch/x86/cpu/x86_64/cpu.c @@ -8,8 +8,6 @@ #include <common.h> #include <debug_uart.h> -DECLARE_GLOBAL_DATA_PTR; - /* Global declaration of gd */ struct global_data *global_data_ptr; diff --git a/arch/x86/lib/lpc-uclass.c b/arch/x86/lib/lpc-uclass.c index eb033e6b3f..37b0c216c2 100644 --- a/arch/x86/lib/lpc-uclass.c +++ b/arch/x86/lib/lpc-uclass.c @@ -8,8 +8,6 @@ #include <common.h> #include <dm.h> -DECLARE_GLOBAL_DATA_PTR; - UCLASS_DRIVER(lpc) = { .id = UCLASS_LPC, .name = "lpc", diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index 6af1bf4678..9932ee69a0 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -28,8 +28,6 @@ #include <linux/compiler.h> #include <linux/libfdt.h> -DECLARE_GLOBAL_DATA_PTR; - /* * Memory lay-out: * |