diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-12-08 14:54:11 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-12-08 14:54:11 +0100 |
| commit | 9b1d12fff0650706eb3c335d31bd378b5d873cb2 (patch) | |
| tree | 360c6a3a1d2e9aeca0463f1ec4e49e1a3dcd0b8e /arch | |
| parent | 3eade89c7573f8893fe045290e374d4502092e13 (diff) | |
| parent | 3bfd83d0f1fb3cedef7c803ad7f5cee78ca3415d (diff) | |
| download | barebox-9b1d12fff0650706eb3c335d31bd378b5d873cb2.tar.gz barebox-9b1d12fff0650706eb3c335d31bd378b5d873cb2.tar.xz | |
Merge branch 'for-next/randconfig'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/dts/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-nomadik/clock.c | 6 | ||||
| -rw-r--r-- | arch/arm/pbl/.gitignore | 2 | ||||
| -rw-r--r-- | arch/arm/pbl/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/pbl/piggy.xzkern.S | 6 |
6 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6e9e715433..941a5ec008 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -273,6 +273,7 @@ config AEABI config THUMB2_BAREBOX select ARM_ASM_UNIFIED select AEABI + depends on !ARCH_TEGRA depends on CPU_V7 && !CPU_32v4T && !CPU_32v5 && !CPU_32v6 bool "Compile barebox in thumb-2 mode (read help)" help diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 9981073c40..dc32dd37c2 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -1,5 +1,7 @@ BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB_NAME)) +ifneq ($(BUILTIN_DTB),) obj-dtb-$(CONFIG_BUILTIN_DTB) += $(BUILTIN_DTB).dtb.o +endif # just to build a built-in.o. Otherwise compilation fails when no devicetree is # created. diff --git a/arch/arm/mach-nomadik/clock.c b/arch/arm/mach-nomadik/clock.c index 5f34a2cd9b..f3ea958aec 100644 --- a/arch/arm/mach-nomadik/clock.c +++ b/arch/arm/mach-nomadik/clock.c @@ -22,6 +22,12 @@ unsigned long clk_get_rate(struct clk *clk) } EXPORT_SYMBOL(clk_get_rate); +int clk_set_rate(struct clk *clk, unsigned long rate) +{ + return 0; +} +EXPORT_SYMBOL(clk_set_rate); + /* enable and disable do nothing */ int clk_enable(struct clk *clk) { diff --git a/arch/arm/pbl/.gitignore b/arch/arm/pbl/.gitignore index 1b7f618f08..be604a81bf 100644 --- a/arch/arm/pbl/.gitignore +++ b/arch/arm/pbl/.gitignore @@ -1,6 +1,8 @@ piggy.gzip piggy.lzo piggy.lz4 +piggy.xzkern +piggy.shipped zbarebox zbarebox.bin zbarebox.lds diff --git a/arch/arm/pbl/Makefile b/arch/arm/pbl/Makefile index 1741090bf8..1b90b377a6 100644 --- a/arch/arm/pbl/Makefile +++ b/arch/arm/pbl/Makefile @@ -2,6 +2,7 @@ suffix_$(CONFIG_IMAGE_COMPRESSION_GZIP) = gzip suffix_$(CONFIG_IMAGE_COMPRESSION_LZO) = lzo suffix_$(CONFIG_IMAGE_COMPRESSION_LZ4) = lz4 +suffix_$(CONFIG_IMAGE_COMPRESSION_XZKERN) = xzkern suffix_$(CONFIG_IMAGE_COMPRESSION_NONE) = shipped OBJCOPYFLAGS_zbarebox.bin = -O binary diff --git a/arch/arm/pbl/piggy.xzkern.S b/arch/arm/pbl/piggy.xzkern.S new file mode 100644 index 0000000000..a7c0259590 --- /dev/null +++ b/arch/arm/pbl/piggy.xzkern.S @@ -0,0 +1,6 @@ + .section .piggydata,#alloc + .globl input_data +input_data: + .incbin "arch/arm/pbl/piggy.xzkern" + .globl input_data_end +input_data_end: |