Merge branch 'for-next/randconfig'
This commit is contained in:
commit
9b1d12fff0
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
piggy.gzip
|
||||
piggy.lzo
|
||||
piggy.lz4
|
||||
piggy.xzkern
|
||||
piggy.shipped
|
||||
zbarebox
|
||||
zbarebox.bin
|
||||
zbarebox.lds
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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:
|
|
@ -455,7 +455,7 @@ config CMD_GO
|
|||
in which case the file is memmapped and executed
|
||||
|
||||
config CMD_LOADB
|
||||
depends on !CONSOLE_NONE
|
||||
depends on CONSOLE_FULL
|
||||
select CRC16
|
||||
tristate
|
||||
prompt "loadb"
|
||||
|
@ -471,7 +471,7 @@ config CMD_LOADB
|
|||
-c create file if not present
|
||||
|
||||
config CMD_LOADS
|
||||
depends on !CONSOLE_NONE
|
||||
depends on CONSOLE_FULL
|
||||
tristate
|
||||
prompt "loads"
|
||||
help
|
||||
|
@ -483,7 +483,7 @@ config CMD_LOADS
|
|||
|
||||
config CMD_LOADY
|
||||
select XYMODEM
|
||||
depends on !CONSOLE_NONE
|
||||
depends on CONSOLE_FULL
|
||||
tristate
|
||||
prompt "loady"
|
||||
help
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
#include <init.h>
|
||||
#include <common.h>
|
||||
#include <malloc.h>
|
||||
|
||||
#include <linux/err.h>
|
||||
#include <linux/basic_mmio_gpio.h>
|
||||
|
||||
static int clps711x_gpio_probe(struct device_d *dev)
|
||||
|
|
|
@ -32,12 +32,6 @@
|
|||
|
||||
#include <asm/mmu.h>
|
||||
|
||||
#include <mach/generic.h>
|
||||
#include <mach/clock.h>
|
||||
#ifndef CONFIG_ARCH_MXS
|
||||
# include <mach/iim.h>
|
||||
#endif
|
||||
|
||||
#include "fec_imx.h"
|
||||
|
||||
struct fec_frame {
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
menuconfig USB_GADGET
|
||||
select USB
|
||||
select POLLER
|
||||
bool "USB gadget support"
|
||||
|
||||
if USB_GADGET
|
||||
|
@ -13,7 +14,6 @@ config USB_GADGET_DRIVER_ARC
|
|||
depends on ARCH_IMX || ARCH_MXS
|
||||
default y
|
||||
select USB_GADGET_DUALSPEED
|
||||
select POLLER
|
||||
|
||||
config USB_GADGET_DRIVER_AT91
|
||||
bool
|
||||
|
@ -21,7 +21,6 @@ config USB_GADGET_DRIVER_AT91
|
|||
depends on ARCH_AT91
|
||||
default y
|
||||
select USB_GADGET_DUALSPEED
|
||||
select POLLER
|
||||
|
||||
config USB_GADGET_DRIVER_PXA27X
|
||||
bool
|
||||
|
@ -29,7 +28,6 @@ config USB_GADGET_DRIVER_PXA27X
|
|||
depends on ARCH_PXA
|
||||
default y
|
||||
select USB_GADGET_DUALSPEED
|
||||
select POLLER
|
||||
|
||||
comment "USB Gadget drivers"
|
||||
|
||||
|
@ -46,6 +44,7 @@ config USB_GADGET_SERIAL
|
|||
config USB_GADGET_FASTBOOT
|
||||
bool
|
||||
select BANNER
|
||||
depends on COMMAND_SUPPORT
|
||||
prompt "Android Fastboot support"
|
||||
|
||||
endif
|
||||
|
|
|
@ -87,6 +87,7 @@ config DRIVER_VIDEO_SIMPLEFB
|
|||
based on the active barebox framebuffer.
|
||||
|
||||
config DRIVER_VIDEO_EDID
|
||||
depends on I2C
|
||||
bool "Add EDID support"
|
||||
help
|
||||
This enabled support for reading and parsing EDID data from an attached
|
||||
|
|
|
@ -76,6 +76,7 @@ config FS_BPKFS
|
|||
|
||||
config FS_UIMAGEFS
|
||||
bool
|
||||
select CRC32
|
||||
prompt "uImage FS support"
|
||||
|
||||
endmenu
|
||||
|
|
Loading…
Reference in New Issue