diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-06-11 11:33:34 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-06-11 11:33:34 +0200 |
| commit | 06b8bc4d708b8ff4eba1dd9b48ec110a8019d2c8 (patch) | |
| tree | 3c7c238c81aa91405159959906f31f6195aa6217 /arch | |
| parent | b697fba4a5c5395a9db271efa286870191418040 (diff) | |
| parent | b917f7864115a35fbb9e69af2c1d553a110a37fc (diff) | |
| download | barebox-06b8bc4d708b8ff4eba1dd9b48ec110a8019d2c8.tar.gz barebox-06b8bc4d708b8ff4eba1dd9b48ec110a8019d2c8.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Makefile | 1 | ||||
| -rw-r--r-- | arch/blackfin/Makefile | 1 | ||||
| -rw-r--r-- | arch/mips/Kconfig | 2 | ||||
| -rw-r--r-- | arch/mips/Makefile | 2 | ||||
| -rw-r--r-- | arch/mips/include/asm/asm.h | 8 | ||||
| -rw-r--r-- | arch/nios2/Makefile | 2 | ||||
| -rw-r--r-- | arch/openrisc/Makefile | 2 | ||||
| -rw-r--r-- | arch/riscv/dts/erizo-generic.dts | 2 |
8 files changed, 14 insertions, 6 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 0daaff2a07..4d54f339f1 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -1,3 +1,4 @@ +KBUILD_DEFCONFIG := qemu_virt64_defconfig CPPFLAGS += -D__ARM__ -fno-strict-aliasing # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb: diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile index 381c6a9f39..5c43bf7d71 100644 --- a/arch/blackfin/Makefile +++ b/arch/blackfin/Makefile @@ -1,3 +1,4 @@ +KBUILD_DEFCONFIG := ipe337_defconfig CPPFLAGS += -fno-strict-aliasing diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 5901930a73..936e56fa27 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -35,7 +35,7 @@ config MIPS_RELOCATION_TABLE_SIZE hex "Relocation table size" range 0x100 0x10000 default "0x8000" - ---help--- + help A table of relocation data will be appended to the Barebox binary and parsed in relocate_code() to fix up all offsets in the relocated Barebox. diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 6f1a1ce617..ee465dc8e9 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -1,3 +1,5 @@ +KBUILD_DEFCONFIG := qemu-malta_defconfig + # # Select the object file format to substitute into the linker script. # diff --git a/arch/mips/include/asm/asm.h b/arch/mips/include/asm/asm.h index a85467ceed..69931662ff 100644 --- a/arch/mips/include/asm/asm.h +++ b/arch/mips/include/asm/asm.h @@ -102,8 +102,8 @@ EXPORT(symbol) nop; \ \ /* No return */ \ -__error: \ - b __error; \ +1: \ + b 1b; \ nop; /* @@ -116,8 +116,8 @@ __error: \ /* trigger a soft breakpoint for OpenOCD */ \ SDBBP; \ /* position independent variant of dead loop */ \ - __error: \ - b __error; \ +1: \ + b 1b; \ nop; \ /* Call some code from .text section. \ * It is needed to keep same linker script for \ diff --git a/arch/nios2/Makefile b/arch/nios2/Makefile index 3e97155e7c..0dff0bed35 100644 --- a/arch/nios2/Makefile +++ b/arch/nios2/Makefile @@ -1,3 +1,5 @@ +KBUILD_DEFCONFIG := generic_defconfig + CPPFLAGS += -fno-strict-aliasing -mno-hw-mul board-$(CONFIG_GENERIC) := generic diff --git a/arch/openrisc/Makefile b/arch/openrisc/Makefile index b0c8566e4e..5394afb7f0 100644 --- a/arch/openrisc/Makefile +++ b/arch/openrisc/Makefile @@ -1,3 +1,5 @@ +KBUILD_DEFCONFIG := generic_defconfig + CPPFLAGS += -D__OR1K__ -ffixed-r10 -mhard-mul -mhard-div board-$(CONFIG_GENERIC) := generic diff --git a/arch/riscv/dts/erizo-generic.dts b/arch/riscv/dts/erizo-generic.dts index d1f8d57168..29da01ef8e 100644 --- a/arch/riscv/dts/erizo-generic.dts +++ b/arch/riscv/dts/erizo-generic.dts @@ -7,7 +7,7 @@ model = "generic Erizo SoC board"; compatible = "miet-riscv-workgroup,erizo-generic-board"; - memory@0 { + memory@80000000 { device_type = "memory"; reg = <0x80000000 0x00800000>; }; |