diff options
author | Andrei Gherzan <andrei@gherzan.ro> | 2019-07-18 13:30:32 +0100 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.ro> | 2019-07-18 15:20:46 +0100 |
commit | fb6ec0aabf272eca1cf57e910cebe3532f1cafd8 (patch) | |
tree | 95a06d0a1b8d3aed9be2c6be20c20c92c5898de2 /recipes-bsp/u-boot/u-boot-2019.07/0010-arm-bcm283x-Define-device-base-addresses-for-bcm2835.patch | |
parent | 570bed8acfbaf2dfd99469909a6f01e5b9b3caed (diff) | |
download | meta-raspberrypi-ag/rpi4-misc.tar.gz |
u-boot: Replace custom fork by patchesag/rpi4-misc
The upstream branch might suffer rebases due to effort of pushing the
patches upstream. To avoid issues, let's have here the patches we need
for RPi 4 support.
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Diffstat (limited to 'recipes-bsp/u-boot/u-boot-2019.07/0010-arm-bcm283x-Define-device-base-addresses-for-bcm2835.patch')
-rw-r--r-- | recipes-bsp/u-boot/u-boot-2019.07/0010-arm-bcm283x-Define-device-base-addresses-for-bcm2835.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/recipes-bsp/u-boot/u-boot-2019.07/0010-arm-bcm283x-Define-device-base-addresses-for-bcm2835.patch b/recipes-bsp/u-boot/u-boot-2019.07/0010-arm-bcm283x-Define-device-base-addresses-for-bcm2835.patch new file mode 100644 index 0000000..bfba764 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-2019.07/0010-arm-bcm283x-Define-device-base-addresses-for-bcm2835.patch | |||
@@ -0,0 +1,64 @@ | |||
1 | From 1f7bbd8ee6f4781473d87f6194ad2f815b1c1a19 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andrei Gherzan <andrei@balena.io> | ||
3 | Date: Fri, 12 Jul 2019 11:38:11 +0100 | ||
4 | Subject: [PATCH 10/12] arm: bcm283x: Define device base addresses for bcm2835 | ||
5 | |||
6 | Signed-off-by: Andrei Gherzan <andrei@balena.io> | ||
7 | Upstream-status: Pending | ||
8 | --- | ||
9 | arch/arm/mach-bcm283x/include/mach/sdhci.h | 4 ++++ | ||
10 | arch/arm/mach-bcm283x/include/mach/timer.h | 4 ++++ | ||
11 | arch/arm/mach-bcm283x/include/mach/wdog.h | 4 ++++ | ||
12 | 3 files changed, 12 insertions(+) | ||
13 | |||
14 | diff --git a/arch/arm/mach-bcm283x/include/mach/sdhci.h b/arch/arm/mach-bcm283x/include/mach/sdhci.h | ||
15 | index 5cb6ec3340..262b016a1b 100644 | ||
16 | --- a/arch/arm/mach-bcm283x/include/mach/sdhci.h | ||
17 | +++ b/arch/arm/mach-bcm283x/include/mach/sdhci.h | ||
18 | @@ -7,7 +7,11 @@ | ||
19 | #define _BCM2835_SDHCI_H_ | ||
20 | |||
21 | #ifndef CONFIG_BCM2835 | ||
22 | +#ifdef CONFIG_BCM2838 | ||
23 | +#define BCM2835_SDHCI_BASE 0xfe300000 | ||
24 | +#else | ||
25 | #define BCM2835_SDHCI_BASE 0x3f300000 | ||
26 | +#endif | ||
27 | #else | ||
28 | #define BCM2835_SDHCI_BASE 0x20300000 | ||
29 | #endif | ||
30 | diff --git a/arch/arm/mach-bcm283x/include/mach/timer.h b/arch/arm/mach-bcm283x/include/mach/timer.h | ||
31 | index 56b0c356bb..dc3ed98879 100644 | ||
32 | --- a/arch/arm/mach-bcm283x/include/mach/timer.h | ||
33 | +++ b/arch/arm/mach-bcm283x/include/mach/timer.h | ||
34 | @@ -7,7 +7,11 @@ | ||
35 | #define _BCM2835_TIMER_H | ||
36 | |||
37 | #ifndef CONFIG_BCM2835 | ||
38 | +#ifdef CONFIG_BCM2838 | ||
39 | +#define BCM2835_TIMER_PHYSADDR 0xfe003000 | ||
40 | +#else | ||
41 | #define BCM2835_TIMER_PHYSADDR 0x3f003000 | ||
42 | +#endif | ||
43 | #else | ||
44 | #define BCM2835_TIMER_PHYSADDR 0x20003000 | ||
45 | #endif | ||
46 | diff --git a/arch/arm/mach-bcm283x/include/mach/wdog.h b/arch/arm/mach-bcm283x/include/mach/wdog.h | ||
47 | index 99c88e5df7..ef040f385d 100644 | ||
48 | --- a/arch/arm/mach-bcm283x/include/mach/wdog.h | ||
49 | +++ b/arch/arm/mach-bcm283x/include/mach/wdog.h | ||
50 | @@ -7,7 +7,11 @@ | ||
51 | #define _BCM2835_WDOG_H | ||
52 | |||
53 | #ifndef CONFIG_BCM2835 | ||
54 | +#ifdef CONFIG_BCM2838 | ||
55 | +#define BCM2835_WDOG_PHYSADDR 0xfe100000 | ||
56 | +#else | ||
57 | #define BCM2835_WDOG_PHYSADDR 0x3f100000 | ||
58 | +#endif | ||
59 | #else | ||
60 | #define BCM2835_WDOG_PHYSADDR 0x20100000 | ||
61 | #endif | ||
62 | -- | ||
63 | 2.22.0 | ||
64 | |||