diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-10 17:12:28 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-10 17:12:28 -0500 |
| commit | 2918f58faa565bcf89ac8c9e827a2e290ea96f55 (patch) | |
| tree | 4a3b0e30f7cc825882689ba3280990d0060b58a0 /arch | |
| parent | 8bf3c2442b59aedd1e58b7013fc12180cab0b541 (diff) | |
| parent | 1410708eeb310e74af23dbee53a7774038cb3918 (diff) | |
Merge tag 'mips-fixes-for-2019.01' of git://git.denx.de/u-boot-mips
- mips: bcm: disable CONFIG_SWAP_IO_SPACE to force native endianess in readl() & co.
this fixes 09ace9161b95ad3a04b33d1d6a65a929901d28c8
- mips: bcm6838: fix device tree warning
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/dts/brcm,bcm6838.dtsi | 2 | ||||
| -rw-r--r-- | arch/mips/mach-bmips/Kconfig | 10 |
2 files changed, 0 insertions, 12 deletions
diff --git a/arch/mips/dts/brcm,bcm6838.dtsi b/arch/mips/dts/brcm,bcm6838.dtsi index 1018f9ee49..77d6a8e214 100644 --- a/arch/mips/dts/brcm,bcm6838.dtsi +++ b/arch/mips/dts/brcm,bcm6838.dtsi @@ -31,8 +31,6 @@ clocks { compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; u-boot,dm-pre-reloc; periph_osc: periph-osc { diff --git a/arch/mips/mach-bmips/Kconfig b/arch/mips/mach-bmips/Kconfig index 521996599e..b259a931c9 100644 --- a/arch/mips/mach-bmips/Kconfig +++ b/arch/mips/mach-bmips/Kconfig @@ -25,7 +25,6 @@ config SOC_BMIPS_BCM3380 select MIPS_TUNE_4KC select SUPPORTS_BIG_ENDIAN select SUPPORTS_CPU_MIPS32_R1 - select SWAP_IO_SPACE select SYSRESET_WATCHDOG help This supports BMIPS BCM3380 family. @@ -36,7 +35,6 @@ config SOC_BMIPS_BCM6318 select MIPS_TUNE_4KC select SUPPORTS_BIG_ENDIAN select SUPPORTS_CPU_MIPS32_R1 - select SWAP_IO_SPACE select SYSRESET_SYSCON help This supports BMIPS BCM6318 family. @@ -47,7 +45,6 @@ config SOC_BMIPS_BCM6328 select MIPS_TUNE_4KC select SUPPORTS_BIG_ENDIAN select SUPPORTS_CPU_MIPS32_R1 - select SWAP_IO_SPACE select SYSRESET_SYSCON help This supports BMIPS BCM6328 family including BCM63281 and BCM63283. @@ -58,7 +55,6 @@ config SOC_BMIPS_BCM6338 select MIPS_TUNE_4KC select SUPPORTS_BIG_ENDIAN select SUPPORTS_CPU_MIPS32_R1 - select SWAP_IO_SPACE select SYSRESET_SYSCON help This supports BMIPS BCM6338 family. @@ -69,7 +65,6 @@ config SOC_BMIPS_BCM6348 select MIPS_TUNE_4KC select SUPPORTS_BIG_ENDIAN select SUPPORTS_CPU_MIPS32_R1 - select SWAP_IO_SPACE select SYSRESET_WATCHDOG help This supports BMIPS BCM6348 family. @@ -80,7 +75,6 @@ config SOC_BMIPS_BCM6358 select MIPS_TUNE_4KC select SUPPORTS_BIG_ENDIAN select SUPPORTS_CPU_MIPS32_R1 - select SWAP_IO_SPACE select SYSRESET_SYSCON help This supports BMIPS BCM6358 family including BCM6358 and BCM6359. @@ -91,7 +85,6 @@ config SOC_BMIPS_BCM6368 select MIPS_TUNE_4KC select SUPPORTS_BIG_ENDIAN select SUPPORTS_CPU_MIPS32_R1 - select SWAP_IO_SPACE select SYSRESET_SYSCON help This supports BMIPS BCM6368 family including BCM6368 and BCM6369. @@ -102,7 +95,6 @@ config SOC_BMIPS_BCM6362 select MIPS_TUNE_4KC select SUPPORTS_BIG_ENDIAN select SUPPORTS_CPU_MIPS32_R1 - select SWAP_IO_SPACE select SYSRESET_SYSCON help This supports BMIPS BCM6362 family including BCM6361 and BCM6362. @@ -113,7 +105,6 @@ config SOC_BMIPS_BCM63268 select MIPS_TUNE_4KC select SUPPORTS_BIG_ENDIAN select SUPPORTS_CPU_MIPS32_R1 - select SWAP_IO_SPACE select SYSRESET_SYSCON help This supports BMIPS BCM63268 family including BCM63168, BCM63169, @@ -125,7 +116,6 @@ config SOC_BMIPS_BCM6838 select MIPS_TUNE_4KC select SUPPORTS_BIG_ENDIAN select SUPPORTS_CPU_MIPS32_R1 - select SWAP_IO_SPACE select SYSRESET_SYSCON help This supports BMIPS BCM6838 family including BCM68380, BCM68381, |