diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-08-15 10:58:11 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-08-15 10:58:11 +0200 |
| commit | 4c122cff4aa80dbfe9ebccca3ef196f70f75ef22 (patch) | |
| tree | 1b484ef6e14c7382943d2c63c69a75a287c31561 /arch | |
| parent | bd1fbce74f79d647af4ee338f9193351811e80f4 (diff) | |
| parent | 5bbe0ed00f25fa31dfcf2e405300e96210b1d9f1 (diff) | |
| download | barebox-4c122cff4aa80dbfe9ebccca3ef196f70f75ef22.tar.gz barebox-4c122cff4aa80dbfe9ebccca3ef196f70f75ef22.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/imx25.dtsi | 7 | ||||
| -rw-r--r-- | arch/mips/include/asm/bitsperlong.h | 7 | ||||
| -rw-r--r-- | arch/riscv/include/asm/bitsperlong.h | 11 |
3 files changed, 2 insertions, 23 deletions
diff --git a/arch/arm/dts/imx25.dtsi b/arch/arm/dts/imx25.dtsi index 2e069e6f03..eb30461780 100644 --- a/arch/arm/dts/imx25.dtsi +++ b/arch/arm/dts/imx25.dtsi @@ -17,13 +17,6 @@ mmc0 = &esdhc1; mmc2 = &esdhc2; }; - - soc { - iram: sram@78000000 { - compatible = "mmio-sram"; - reg = <0x78000000 0x20000>; - }; - }; }; &usbmisc { diff --git a/arch/mips/include/asm/bitsperlong.h b/arch/mips/include/asm/bitsperlong.h index 41712161bc..6dc0bb0c13 100644 --- a/arch/mips/include/asm/bitsperlong.h +++ b/arch/mips/include/asm/bitsperlong.h @@ -1,6 +1 @@ -#ifndef __ASM_MIPS_BITSPERLONG_H -#define __ASM_MIPS_BITSPERLONG_H - -#define BITS_PER_LONG _MIPS_SZLONG - -#endif /* __ASM_MIPS_BITSPERLONG_H */ +#include <asm-generic/bitsperlong.h> diff --git a/arch/riscv/include/asm/bitsperlong.h b/arch/riscv/include/asm/bitsperlong.h index 4641e7e485..6dc0bb0c13 100644 --- a/arch/riscv/include/asm/bitsperlong.h +++ b/arch/riscv/include/asm/bitsperlong.h @@ -1,10 +1 @@ -#ifndef __ASM_BITSPERLONG_H -#define __ASM_BITSPERLONG_H - -#ifdef __riscv64 -#define BITS_PER_LONG 64 -#else -#define BITS_PER_LONG 32 -#endif - -#endif /* __ASM_BITSPERLONG_H */ +#include <asm-generic/bitsperlong.h> |