diff options
| author | Tom Rini <trini@konsulko.com> | 2020-10-05 13:05:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-10-05 14:10:59 -0400 |
| commit | b7e7831e5d5be047f421ddc1f308afc22764a893 (patch) | |
| tree | 7d5f27c82b260278ed0b3ea96bce592b0505b898 /board/renesas | |
| parent | 050acee119b3757fee3bd128f55d720fdd9bb890 (diff) | |
| parent | caebff09efe8c061b4d99b82262c67fb2db9bbcf (diff) | |
| download | u-boot-b7e7831e5d5be047f421ddc1f308afc22764a893.tar.gz | |
Merge branch 'next'
Bring in the assorted changes that have been staged in the 'next' branch
prior to release.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'board/renesas')
| -rw-r--r-- | board/renesas/condor/condor.c | 9 | ||||
| -rw-r--r-- | board/renesas/draak/draak.c | 19 | ||||
| -rw-r--r-- | board/renesas/ebisu/ebisu.c | 9 | ||||
| -rw-r--r-- | board/renesas/salvator-x/salvator-x.c | 4 | ||||
| -rw-r--r-- | board/renesas/ulcb/ulcb.c | 4 |
5 files changed, 1 insertions, 44 deletions
diff --git a/board/renesas/condor/condor.c b/board/renesas/condor/condor.c index 91afcdd85a..8054511d9d 100644 --- a/board/renesas/condor/condor.c +++ b/board/renesas/condor/condor.c @@ -18,15 +18,6 @@ DECLARE_GLOBAL_DATA_PTR; -void s_init(void) -{ -} - -int board_early_init_f(void) -{ - return 0; -} - int board_init(void) { /* adress of boot parameters */ diff --git a/board/renesas/draak/draak.c b/board/renesas/draak/draak.c index c8f4b214a2..9993f5bbe3 100644 --- a/board/renesas/draak/draak.c +++ b/board/renesas/draak/draak.c @@ -30,10 +30,6 @@ DECLARE_GLOBAL_DATA_PTR; -void s_init(void) -{ -} - #define GSX_MSTP112 BIT(12) /* 3DG */ #define SCIF2_MSTP310 BIT(10) /* SCIF2 */ #define DVFS_MSTP926 BIT(26) @@ -75,23 +71,10 @@ int board_init(void) } #define RST_BASE 0xE6160000 -#define RST_CA57RESCNT (RST_BASE + 0x40) #define RST_CA53RESCNT (RST_BASE + 0x44) -#define RST_RSTOUTCR (RST_BASE + 0x58) -#define RST_CA57_CODE 0xA5A5000F #define RST_CA53_CODE 0x5A5A000F void reset_cpu(ulong addr) { - unsigned long midr, cputype; - - asm volatile("mrs %0, midr_el1" : "=r" (midr)); - cputype = (midr >> 4) & 0xfff; - - if (cputype == 0xd03) - writel(RST_CA53_CODE, RST_CA53RESCNT); - else if (cputype == 0xd07) - writel(RST_CA57_CODE, RST_CA57RESCNT); - else - hang(); + writel(RST_CA53_CODE, RST_CA53RESCNT); } diff --git a/board/renesas/ebisu/ebisu.c b/board/renesas/ebisu/ebisu.c index b6531f61ed..c8d180566d 100644 --- a/board/renesas/ebisu/ebisu.c +++ b/board/renesas/ebisu/ebisu.c @@ -29,15 +29,6 @@ DECLARE_GLOBAL_DATA_PTR; -void s_init(void) -{ -} - -int board_early_init_f(void) -{ - return 0; -} - int board_init(void) { /* adress of boot parameters */ diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c index 947bdaefa8..c78c2a42b0 100644 --- a/board/renesas/salvator-x/salvator-x.c +++ b/board/renesas/salvator-x/salvator-x.c @@ -31,10 +31,6 @@ DECLARE_GLOBAL_DATA_PTR; -void s_init(void) -{ -} - #define DVFS_MSTP926 BIT(26) #define HSUSB_MSTP704 BIT(4) /* HSUSB */ diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c index 07bc1ec719..efbffa0ee7 100644 --- a/board/renesas/ulcb/ulcb.c +++ b/board/renesas/ulcb/ulcb.c @@ -29,10 +29,6 @@ DECLARE_GLOBAL_DATA_PTR; -void s_init(void) -{ -} - #define DVFS_MSTP926 BIT(26) #define HSUSB_MSTP704 BIT(4) /* HSUSB */ |