leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'mips-fixes-for-2019.01' of git://git.denx.de/u-boot-mips

Browse Source 
- mips: bcm: disable CONFIG_SWAP_IO_SPACE to force native endianess in readl() & co.
  this fixes 09ace9161b
- mips: bcm6838: fix device tree warning
This commit is contained in:
Tom Rini
2018-12-10 17:12:28 -05:00
parent 8bf3c2442b 1410708eeb
commit 2918f58faa
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/dts/brcm,bcm6838.dtsi
View File

@@ -31,8 +31,6 @@
clocks { clocks {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
u-boot,dm-pre-reloc; u-boot,dm-pre-reloc;
periph_osc: periph-osc { periph_osc: periph-osc {

10
arch/mips/mach-bmips/Kconfig
View File

@@ -25,7 +25,6 @@ config SOC_BMIPS_BCM3380
select MIPS_TUNE_4KC select MIPS_TUNE_4KC
select SUPPORTS_BIG_ENDIAN select SUPPORTS_BIG_ENDIAN
select SUPPORTS_CPU_MIPS32_R1 select SUPPORTS_CPU_MIPS32_R1
select SWAP_IO_SPACE
select SYSRESET_WATCHDOG select SYSRESET_WATCHDOG
help help
This supports BMIPS BCM3380 family. This supports BMIPS BCM3380 family.
@@ -36,7 +35,6 @@ config SOC_BMIPS_BCM6318
select MIPS_TUNE_4KC select MIPS_TUNE_4KC
select SUPPORTS_BIG_ENDIAN select SUPPORTS_BIG_ENDIAN
select SUPPORTS_CPU_MIPS32_R1 select SUPPORTS_CPU_MIPS32_R1
select SWAP_IO_SPACE
select SYSRESET_SYSCON select SYSRESET_SYSCON
help help
This supports BMIPS BCM6318 family. This supports BMIPS BCM6318 family.
@@ -47,7 +45,6 @@ config SOC_BMIPS_BCM6328
select MIPS_TUNE_4KC select MIPS_TUNE_4KC
select SUPPORTS_BIG_ENDIAN select SUPPORTS_BIG_ENDIAN
select SUPPORTS_CPU_MIPS32_R1 select SUPPORTS_CPU_MIPS32_R1
select SWAP_IO_SPACE
select SYSRESET_SYSCON select SYSRESET_SYSCON
help help
This supports BMIPS BCM6328 family including BCM63281 and BCM63283. This supports BMIPS BCM6328 family including BCM63281 and BCM63283.
@@ -58,7 +55,6 @@ config SOC_BMIPS_BCM6338
select MIPS_TUNE_4KC select MIPS_TUNE_4KC
select SUPPORTS_BIG_ENDIAN select SUPPORTS_BIG_ENDIAN
select SUPPORTS_CPU_MIPS32_R1 select SUPPORTS_CPU_MIPS32_R1
select SWAP_IO_SPACE
select SYSRESET_SYSCON select SYSRESET_SYSCON
help help
This supports BMIPS BCM6338 family. This supports BMIPS BCM6338 family.
@@ -69,7 +65,6 @@ config SOC_BMIPS_BCM6348
select MIPS_TUNE_4KC select MIPS_TUNE_4KC
select SUPPORTS_BIG_ENDIAN select SUPPORTS_BIG_ENDIAN
select SUPPORTS_CPU_MIPS32_R1 select SUPPORTS_CPU_MIPS32_R1
select SWAP_IO_SPACE
select SYSRESET_WATCHDOG select SYSRESET_WATCHDOG
help help
This supports BMIPS BCM6348 family. This supports BMIPS BCM6348 family.
@@ -80,7 +75,6 @@ config SOC_BMIPS_BCM6358
select MIPS_TUNE_4KC select MIPS_TUNE_4KC
select SUPPORTS_BIG_ENDIAN select SUPPORTS_BIG_ENDIAN
select SUPPORTS_CPU_MIPS32_R1 select SUPPORTS_CPU_MIPS32_R1
select SWAP_IO_SPACE
select SYSRESET_SYSCON select SYSRESET_SYSCON
help help
This supports BMIPS BCM6358 family including BCM6358 and BCM6359. This supports BMIPS BCM6358 family including BCM6358 and BCM6359.
@@ -91,7 +85,6 @@ config SOC_BMIPS_BCM6368
select MIPS_TUNE_4KC select MIPS_TUNE_4KC
select SUPPORTS_BIG_ENDIAN select SUPPORTS_BIG_ENDIAN
select SUPPORTS_CPU_MIPS32_R1 select SUPPORTS_CPU_MIPS32_R1
select SWAP_IO_SPACE
select SYSRESET_SYSCON select SYSRESET_SYSCON
help help
This supports BMIPS BCM6368 family including BCM6368 and BCM6369. This supports BMIPS BCM6368 family including BCM6368 and BCM6369.
@@ -102,7 +95,6 @@ config SOC_BMIPS_BCM6362
select MIPS_TUNE_4KC select MIPS_TUNE_4KC
select SUPPORTS_BIG_ENDIAN select SUPPORTS_BIG_ENDIAN
select SUPPORTS_CPU_MIPS32_R1 select SUPPORTS_CPU_MIPS32_R1
select SWAP_IO_SPACE
select SYSRESET_SYSCON select SYSRESET_SYSCON
help help
This supports BMIPS BCM6362 family including BCM6361 and BCM6362. This supports BMIPS BCM6362 family including BCM6361 and BCM6362.
@@ -113,7 +105,6 @@ config SOC_BMIPS_BCM63268
select MIPS_TUNE_4KC select MIPS_TUNE_4KC
select SUPPORTS_BIG_ENDIAN select SUPPORTS_BIG_ENDIAN
select SUPPORTS_CPU_MIPS32_R1 select SUPPORTS_CPU_MIPS32_R1
select SWAP_IO_SPACE
select SYSRESET_SYSCON select SYSRESET_SYSCON
help help
This supports BMIPS BCM63268 family including BCM63168, BCM63169, This supports BMIPS BCM63268 family including BCM63168, BCM63169,
@@ -125,7 +116,6 @@ config SOC_BMIPS_BCM6838
select MIPS_TUNE_4KC select MIPS_TUNE_4KC
select SUPPORTS_BIG_ENDIAN select SUPPORTS_BIG_ENDIAN
select SUPPORTS_CPU_MIPS32_R1 select SUPPORTS_CPU_MIPS32_R1
select SWAP_IO_SPACE
select SYSRESET_SYSCON select SYSRESET_SYSCON
help help
This supports BMIPS BCM6838 family including BCM68380, BCM68381, This supports BMIPS BCM6838 family including BCM68380, BCM68381,