diff options
| author | Quentin Schulz <quentin.schulz@theobroma-systems.com> | 2024-03-11 13:01:56 +0100 |
|---|---|---|
| committer | Kever Yang <kever.yang@rock-chips.com> | 2024-03-13 18:14:19 +0800 |
| commit | eda2c8736e63b0e0e308780663ef048cb918b847 (patch) | |
| tree | 64bf688d7e477555fef47accad616a120e407e1f /arch | |
| parent | 8ed8517d9e54424df1966f862cb7620c5996722a (diff) | |
| download | u-boot-eda2c8736e63b0e0e308780663ef048cb918b847.zip u-boot-eda2c8736e63b0e0e308780663ef048cb918b847.tar.gz u-boot-eda2c8736e63b0e0e308780663ef048cb918b847.tar.bz2 | |
rockchip: migrate hardware.h inclusion into appropriate files
hardware.h is only defining macros which are "wrappers" around writel().
writel() is however not available in hardware.h, <asm/io.h> needs to be
included. This means in order to use the wrappers in hardware.h, one
also needs to include the <asm/io.h> header.
However, this cannot be done currently because hardware.h is included in
include/configs files, which are implicitly included by every code file
by default, which makes the compilation of arch/arm/cpu/armv8/u-boot.lds
fail because ALIGN (the ARM assembly directive) got redefined by some
of the include files coming from <asm.io.h>.
Because nothing in the include/configs file actually use hardware.h,
let's remove the inclusion of hardware.h from the include/configs files
and explicitly add it wherever it is required.
This prepares for the next commit where <asm/io.h> will be included in
hardware.h.
Cc: Quentin Schulz <foss+uboot@0leil.net>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-rockchip/rk3066/rk3066.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-rockchip/rk3066/rk3066.c b/arch/arm/mach-rockchip/rk3066/rk3066.c index 78c7d89..6661b78 100644 --- a/arch/arm/mach-rockchip/rk3066/rk3066.c +++ b/arch/arm/mach-rockchip/rk3066/rk3066.c @@ -7,6 +7,7 @@ #include <asm/io.h> #include <asm/arch-rockchip/bootrom.h> #include <asm/arch-rockchip/grf_rk3066.h> +#include <asm/arch-rockchip/hardware.h> #define GRF_BASE 0x20008000 |