diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-12-10 05:41:25 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-12-10 05:41:25 +0100 |
| commit | 056196ba04574d4f8cf11d92df09eb664a3e62dd (patch) | |
| tree | f768a7c620503236482592ff39eb1830e49b8a1a /arch | |
| parent | e0b4ef8fcd5ca31e7a7dc13caf915aad921cf94f (diff) | |
| parent | c86507a63c6139f70e97d94ffcded88796b87b59 (diff) | |
| download | barebox-056196ba04574d4f8cf11d92df09eb664a3e62dd.tar.gz barebox-056196ba04574d4f8cf11d92df09eb664a3e62dd.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boards/embedsky-e9/board.c | 5 | ||||
| -rw-r--r-- | arch/arm/boards/freescale-mx6-sabresd/board.c | 5 | ||||
| -rw-r--r-- | arch/mips/Makefile | 4 | ||||
| -rw-r--r-- | arch/mips/mach-ath79/art.c | 2 |
4 files changed, 2 insertions, 14 deletions
diff --git a/arch/arm/boards/embedsky-e9/board.c b/arch/arm/boards/embedsky-e9/board.c index 0f47677bb0..e5f92636fb 100644 --- a/arch/arm/boards/embedsky-e9/board.c +++ b/arch/arm/boards/embedsky-e9/board.c @@ -22,7 +22,6 @@ #include <init.h> #include <environment.h> #include <mach/imx6-regs.h> -#include <gpio.h> #include <asm/armlinux.h> #include <generated/mach-types.h> #include <partition.h> @@ -102,8 +101,4 @@ static int e9_coredevices_init(void) return 0; } -/* - * Do this before the fec initializes but after our - * gpios are available. - */ coredevice_initcall(e9_coredevices_init); diff --git a/arch/arm/boards/freescale-mx6-sabresd/board.c b/arch/arm/boards/freescale-mx6-sabresd/board.c index 595b1eae0b..a5059835df 100644 --- a/arch/arm/boards/freescale-mx6-sabresd/board.c +++ b/arch/arm/boards/freescale-mx6-sabresd/board.c @@ -19,7 +19,6 @@ #include <init.h> #include <environment.h> #include <mach/imx6-regs.h> -#include <gpio.h> #include <asm/armlinux.h> #include <generated/mach-types.h> #include <partition.h> @@ -84,8 +83,4 @@ static int sabresd_coredevices_init(void) return 0; } -/* - * Do this before the fec initializes but after our - * gpios are available. - */ coredevice_initcall(sabresd_coredevices_init); diff --git a/arch/mips/Makefile b/arch/mips/Makefile index ee465dc8e9..1c10db599c 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -52,9 +52,7 @@ cflags-$(CONFIG_CPU_MIPS32_R1) += $(call cc-option,-march=mips32,-mips32 -U_MIPS cflags-$(CONFIG_CPU_MIPS32_R2) += $(call cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) -Wa,-mips32r2 -Wa,--trap cflags-$(CONFIG_CPU_MIPS64_R1) += $(call cc-option,-march=mips64,-mips64 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS64) -Wa,-mips64 -Wa,--trap cflags-$(CONFIG_CPU_MIPS64_R2) += $(call cc-option,-march=mips64r2,-mips64r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS64) -Wa,-mips64r2 -Wa,--trap -cflags-$(CONFIG_CPU_LOONGSON1) += \ - $(call cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \ - -Wa,-mips32r2 -Wa,--trap +cflags-$(CONFIG_CPU_LOONGSON1) += $(call cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) -Wa,-mips32r2 -Wa,--trap CPPFLAGS += -DTEXT_BASE=$(CONFIG_TEXT_BASE) diff --git a/arch/mips/mach-ath79/art.c b/arch/mips/mach-ath79/art.c index 2a2099e9f5..44118c19e9 100644 --- a/arch/mips/mach-ath79/art.c +++ b/arch/mips/mach-ath79/art.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2. +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2018 Oleksij Rempel <linux@rempel-privat.de> */ |