Merge branch 'for-next/randconfig'
This commit is contained in:
commit
88107f6e12
|
@ -60,12 +60,14 @@ config ARCH_S3C24xx
|
||||||
select ARCH_SAMSUNG
|
select ARCH_SAMSUNG
|
||||||
select CPU_ARM920T
|
select CPU_ARM920T
|
||||||
select GENERIC_GPIO
|
select GENERIC_GPIO
|
||||||
|
#
|
||||||
config ARCH_S5PCxx
|
# Currently no board support
|
||||||
bool "Samsung S5PC110, S5PV210"
|
#
|
||||||
select ARCH_SAMSUNG
|
#config ARCH_S5PCxx
|
||||||
select CPU_V7
|
# bool "Samsung S5PC110, S5PV210"
|
||||||
select GENERIC_GPIO
|
# select ARCH_SAMSUNG
|
||||||
|
# select CPU_V7
|
||||||
|
# select GENERIC_GPIO
|
||||||
|
|
||||||
config ARCH_VERSATILE
|
config ARCH_VERSATILE
|
||||||
bool "ARM Versatile boards (ARM926EJ-S)"
|
bool "ARM Versatile boards (ARM926EJ-S)"
|
||||||
|
|
|
@ -94,7 +94,6 @@ board-$(CONFIG_MACH_IMX21ADS) := imx21ads
|
||||||
board-$(CONFIG_MACH_IMX27ADS) := imx27ads
|
board-$(CONFIG_MACH_IMX27ADS) := imx27ads
|
||||||
board-$(CONFIG_MACH_MIOA701) := mioa701
|
board-$(CONFIG_MACH_MIOA701) := mioa701
|
||||||
board-$(CONFIG_MACH_MMCCPU) := mmccpu
|
board-$(CONFIG_MACH_MMCCPU) := mmccpu
|
||||||
board-$(CONFIG_MACH_MX1ADS) := mx1ads
|
|
||||||
board-$(CONFIG_MACH_NOMADIK_8815NHK) := nhk8815
|
board-$(CONFIG_MACH_NOMADIK_8815NHK) := nhk8815
|
||||||
board-$(CONFIG_MACH_NXDB500) := netx
|
board-$(CONFIG_MACH_NXDB500) := netx
|
||||||
board-$(CONFIG_MACH_OMAP343xSDP) := omap343xdsp
|
board-$(CONFIG_MACH_OMAP343xSDP) := omap343xdsp
|
||||||
|
|
|
@ -3,8 +3,7 @@
|
||||||
|
|
||||||
#include <asm/memory.h>
|
#include <asm/memory.h>
|
||||||
|
|
||||||
#if defined CONFIG_CMD_BOOTM || defined CONFIG_CMD_BOOTZ || \
|
#if defined CONFIG_ARM_LINUX
|
||||||
defined CONFIG_CMD_BOOTU
|
|
||||||
void armlinux_set_bootparams(void *params);
|
void armlinux_set_bootparams(void *params);
|
||||||
void armlinux_set_architecture(int architecture);
|
void armlinux_set_architecture(int architecture);
|
||||||
void armlinux_set_revision(unsigned int);
|
void armlinux_set_revision(unsigned int);
|
||||||
|
|
|
@ -399,7 +399,7 @@ static int do_bootm_aimage(struct image_data *data)
|
||||||
if (!getenv("aimage_noverwrite_tags"))
|
if (!getenv("aimage_noverwrite_tags"))
|
||||||
armlinux_set_bootparams((void*)header->tags_addr);
|
armlinux_set_bootparams((void*)header->tags_addr);
|
||||||
|
|
||||||
if (data->oftree) {
|
if (IS_ENABLED(CONFIG_OFTREE) && data->oftree) {
|
||||||
ret = of_fix_tree(data->oftree);
|
ret = of_fix_tree(data->oftree);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err_out;
|
goto err_out;
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
#include <mach/board.h>
|
#include <mach/board.h>
|
||||||
#include <mach/gpio.h>
|
#include <mach/gpio.h>
|
||||||
#include <mach/io.h>
|
#include <mach/io.h>
|
||||||
|
#include <mach/at91rm9200_mc.h>
|
||||||
#include <sizes.h>
|
#include <sizes.h>
|
||||||
|
|
||||||
#include "generic.h"
|
#include "generic.h"
|
||||||
|
@ -158,7 +159,7 @@ void __init at91_add_device_nand(struct atmel_nand_data *data) {}
|
||||||
* -------------------------------------------------------------------- */
|
* -------------------------------------------------------------------- */
|
||||||
|
|
||||||
#if defined(CONFIG_DRIVER_SPI_ATMEL)
|
#if defined(CONFIG_DRIVER_SPI_ATMEL)
|
||||||
static const unsigned spi_standard_cs[4] = { AT91_PIN_PA3, AT91_PIN_PA4, AT91_PIN_PA5, AT91_PIN_PA6 };
|
static unsigned spi_standard_cs[4] = { AT91_PIN_PA3, AT91_PIN_PA4, AT91_PIN_PA5, AT91_PIN_PA6 };
|
||||||
|
|
||||||
static struct at91_spi_platform_data spi_pdata[] = {
|
static struct at91_spi_platform_data spi_pdata[] = {
|
||||||
[0] = {
|
[0] = {
|
||||||
|
|
|
@ -107,9 +107,9 @@ void at91_add_device_nand(struct atmel_nand_data *data) {}
|
||||||
* -------------------------------------------------------------------- */
|
* -------------------------------------------------------------------- */
|
||||||
|
|
||||||
#if defined(CONFIG_DRIVER_SPI_ATMEL)
|
#if defined(CONFIG_DRIVER_SPI_ATMEL)
|
||||||
static const unsigned spi0_standard_cs[4] = { AT91_PIN_PA3, AT91_PIN_PA4, AT91_PIN_PA5, AT91_PIN_PA6 };
|
static unsigned spi0_standard_cs[4] = { AT91_PIN_PA3, AT91_PIN_PA4, AT91_PIN_PA5, AT91_PIN_PA6 };
|
||||||
|
|
||||||
static const unsigned spi1_standard_cs[4] = { AT91_PIN_PB28, AT91_PIN_PA24, AT91_PIN_PA25, AT91_PIN_PA26 };
|
static unsigned spi1_standard_cs[4] = { AT91_PIN_PB28, AT91_PIN_PA24, AT91_PIN_PA25, AT91_PIN_PA26 };
|
||||||
|
|
||||||
static struct at91_spi_platform_data spi_pdata[] = {
|
static struct at91_spi_platform_data spi_pdata[] = {
|
||||||
[0] = {
|
[0] = {
|
||||||
|
@ -150,7 +150,7 @@ void at91_add_device_spi(int spi_id, struct at91_spi_platform_data *pdata)
|
||||||
at91_set_A_periph(AT91_PIN_PA2, 0); /* SPI0_SPCK */
|
at91_set_A_periph(AT91_PIN_PA2, 0); /* SPI0_SPCK */
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
start = AT91SAM9213_BASE_SPI1;
|
start = AT91SAM9261_BASE_SPI1;
|
||||||
at91_set_A_periph(AT91_PIN_PB30, 0); /* SPI1_MISO */
|
at91_set_A_periph(AT91_PIN_PB30, 0); /* SPI1_MISO */
|
||||||
at91_set_A_periph(AT91_PIN_PB31, 0); /* SPI1_MOSI */
|
at91_set_A_periph(AT91_PIN_PB31, 0); /* SPI1_MOSI */
|
||||||
at91_set_A_periph(AT91_PIN_PB29, 0); /* SPI1_SPCK */
|
at91_set_A_periph(AT91_PIN_PB29, 0); /* SPI1_SPCK */
|
||||||
|
|
|
@ -248,15 +248,6 @@ struct at91_gpio_bank {
|
||||||
|
|
||||||
extern int at91_gpio_init(struct at91_gpio_bank *data, int nr_banks);
|
extern int at91_gpio_init(struct at91_gpio_bank *data, int nr_banks);
|
||||||
|
|
||||||
static inline int gpio_request(unsigned gpio, const char *label)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void gpio_free(unsigned gpio)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
extern int gpio_direction_input(unsigned gpio);
|
extern int gpio_direction_input(unsigned gpio);
|
||||||
extern int gpio_direction_output(unsigned gpio, int value);
|
extern int gpio_direction_output(unsigned gpio, int value);
|
||||||
#define gpio_get_value at91_get_gpio_value
|
#define gpio_get_value at91_get_gpio_value
|
||||||
|
|
|
@ -6,7 +6,6 @@ config ARCH_TEXT_BASE
|
||||||
default 0xa0000000 if MACH_EUKREA_CPUIMX27
|
default 0xa0000000 if MACH_EUKREA_CPUIMX27
|
||||||
default 0x87f00000 if MACH_EUKREA_CPUIMX35
|
default 0x87f00000 if MACH_EUKREA_CPUIMX35
|
||||||
default 0x97f00000 if MACH_EUKREA_CPUIMX51SD
|
default 0x97f00000 if MACH_EUKREA_CPUIMX51SD
|
||||||
default 0x08f00000 if MACH_MX1ADS
|
|
||||||
default 0xc0000000 if MACH_IMX21ADS
|
default 0xc0000000 if MACH_IMX21ADS
|
||||||
default 0xa0000000 if MACH_IMX27ADS
|
default 0xa0000000 if MACH_IMX27ADS
|
||||||
default 0x83f00000 if MACH_FREESCALE_MX25_3STACK && FREESCALE_MX25_3STACK_SDRAM_64MB_DDR2
|
default 0x83f00000 if MACH_FREESCALE_MX25_3STACK && FREESCALE_MX25_3STACK_SDRAM_64MB_DDR2
|
||||||
|
@ -110,6 +109,7 @@ config NAND_IMX_BOOT
|
||||||
|
|
||||||
config ARCH_IMX_EXTERNAL_BOOT_NAND
|
config ARCH_IMX_EXTERNAL_BOOT_NAND
|
||||||
bool
|
bool
|
||||||
|
depends on !ARCH_IMX1
|
||||||
prompt "Support Starting barebox from NAND"
|
prompt "Support Starting barebox from NAND"
|
||||||
depends on ARCH_IMX_EXTERNAL_BOOT
|
depends on ARCH_IMX_EXTERNAL_BOOT
|
||||||
|
|
||||||
|
@ -186,12 +186,6 @@ choice
|
||||||
|
|
||||||
prompt "i.MX1 Board Type"
|
prompt "i.MX1 Board Type"
|
||||||
|
|
||||||
config MACH_MX1ADS
|
|
||||||
bool "mx1ads"
|
|
||||||
select HAS_CS8900
|
|
||||||
help
|
|
||||||
Say Y here if you are using the Motorola MX1ADS board
|
|
||||||
|
|
||||||
config MACH_SCB9328
|
config MACH_SCB9328
|
||||||
bool "Synertronixx scb9328"
|
bool "Synertronixx scb9328"
|
||||||
select HAS_DM9000
|
select HAS_DM9000
|
||||||
|
|
|
@ -11,7 +11,7 @@ obj-$(CONFIG_ARCH_IMX6) += speed-imx6.o imx6.o iomux-v3.o
|
||||||
obj-$(CONFIG_IMX_CLKO) += clko.o
|
obj-$(CONFIG_IMX_CLKO) += clko.o
|
||||||
obj-$(CONFIG_IMX_IIM) += iim.o
|
obj-$(CONFIG_IMX_IIM) += iim.o
|
||||||
obj-$(CONFIG_NAND_IMX) += nand.o
|
obj-$(CONFIG_NAND_IMX) += nand.o
|
||||||
obj-$(CONFIG_ARCH_IMX_EXTERNAL_BOOT_NAND) += internal-nand-boot.o
|
obj-$(CONFIG_ARCH_IMX_EXTERNAL_BOOT_NAND) += external-nand-boot.o
|
||||||
obj-y += speed.o
|
obj-y += speed.o
|
||||||
obj-y += devices.o
|
obj-y += devices.o
|
||||||
obj-y += boot.o
|
obj-y += boot.o
|
||||||
|
|
|
@ -349,6 +349,7 @@ config CMD_BOOTM
|
||||||
tristate
|
tristate
|
||||||
default y
|
default y
|
||||||
select CRC32
|
select CRC32
|
||||||
|
select UIMAGE
|
||||||
select UNCOMPRESS
|
select UNCOMPRESS
|
||||||
select FILETYPE
|
select FILETYPE
|
||||||
select GLOBALVAR
|
select GLOBALVAR
|
||||||
|
@ -397,6 +398,7 @@ config CMD_BOOTM_AIMAGE
|
||||||
Support using Android Images.
|
Support using Android Images.
|
||||||
|
|
||||||
config CMD_UIMAGE
|
config CMD_UIMAGE
|
||||||
|
select UIMAGE
|
||||||
tristate
|
tristate
|
||||||
prompt "uimage"
|
prompt "uimage"
|
||||||
help
|
help
|
||||||
|
|
|
@ -38,11 +38,11 @@ static int do_exec(int argc, char *argv[])
|
||||||
return COMMAND_ERROR_USAGE;
|
return COMMAND_ERROR_USAGE;
|
||||||
|
|
||||||
for (i=1; i<argc; ++i) {
|
for (i=1; i<argc; ++i) {
|
||||||
script = read_file(argv[i]);
|
script = read_file(argv[i], NULL);
|
||||||
if (!script)
|
if (!script)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
if (run_command (script, flag) == -1)
|
if (run_command (script, 0) == -1)
|
||||||
goto out;
|
goto out;
|
||||||
free(script);
|
free(script);
|
||||||
}
|
}
|
||||||
|
|
|
@ -61,10 +61,10 @@
|
||||||
#define untochar(x) ((int) (((x) - SPACE) & 0xff))
|
#define untochar(x) ((int) (((x) - SPACE) & 0xff))
|
||||||
#define DEF_FILE "image.bin"
|
#define DEF_FILE "image.bin"
|
||||||
|
|
||||||
#ifdef CONFIG_CMD_LOADB
|
|
||||||
|
|
||||||
static int ofd; /* output file descriptor */
|
static int ofd; /* output file descriptor */
|
||||||
|
|
||||||
|
#ifdef CONFIG_CMD_LOADB
|
||||||
|
|
||||||
/* Size of my buffer to write to o/p file */
|
/* Size of my buffer to write to o/p file */
|
||||||
#define MAX_WRITE_BUFFER 4096 /* Write size to o/p file */
|
#define MAX_WRITE_BUFFER 4096 /* Write size to o/p file */
|
||||||
static char *write_buffer; /* buffer for finalized data to write */
|
static char *write_buffer; /* buffer for finalized data to write */
|
||||||
|
|
|
@ -47,6 +47,11 @@ config BINFMT
|
||||||
bool
|
bool
|
||||||
select FILETYPE
|
select FILETYPE
|
||||||
|
|
||||||
|
config UIMAGE
|
||||||
|
select UNCOMPRESS
|
||||||
|
select CRC32
|
||||||
|
bool
|
||||||
|
|
||||||
config GLOBALVAR
|
config GLOBALVAR
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
|
|
@ -24,8 +24,8 @@ obj-$(CONFIG_CONSOLE_FULL) += console.o
|
||||||
obj-$(CONFIG_CONSOLE_SIMPLE) += console_simple.o
|
obj-$(CONFIG_CONSOLE_SIMPLE) += console_simple.o
|
||||||
obj-$(CONFIG_DIGEST) += digest.o
|
obj-$(CONFIG_DIGEST) += digest.o
|
||||||
obj-$(CONFIG_ENVIRONMENT_VARIABLES) += env.o
|
obj-$(CONFIG_ENVIRONMENT_VARIABLES) += env.o
|
||||||
obj-$(CONFIG_CMD_BOOTM) += image.o
|
obj-$(CONFIG_UIMAGE) += image.o
|
||||||
obj-$(CONFIG_CMD_BOOTM) += uimage.o
|
obj-$(CONFIG_UIMAGE) += uimage.o
|
||||||
obj-y += startup.o
|
obj-y += startup.o
|
||||||
obj-y += misc.o
|
obj-y += misc.o
|
||||||
obj-y += memsize.o
|
obj-y += memsize.o
|
||||||
|
|
|
@ -6,7 +6,7 @@ menu "I2C Hardware Bus support"
|
||||||
|
|
||||||
config I2C_IMX
|
config I2C_IMX
|
||||||
bool "i.MX I2C Master driver"
|
bool "i.MX I2C Master driver"
|
||||||
depends on ARCH_IMX
|
depends on ARCH_IMX && !ARCH_IMX1
|
||||||
|
|
||||||
config I2C_OMAP
|
config I2C_OMAP
|
||||||
bool "OMAP I2C Master driver"
|
bool "OMAP I2C Master driver"
|
||||||
|
|
|
@ -7,6 +7,7 @@ menu "Input device support"
|
||||||
config KEYBOARD_GPIO
|
config KEYBOARD_GPIO
|
||||||
bool "GPIO Buttons"
|
bool "GPIO Buttons"
|
||||||
depends on GENERIC_GPIO
|
depends on GENERIC_GPIO
|
||||||
|
select POLLER
|
||||||
help
|
help
|
||||||
This driver implements support for buttons connected
|
This driver implements support for buttons connected
|
||||||
to GPIO pins of various CPUs (and some other chips).
|
to GPIO pins of various CPUs (and some other chips).
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
#include <command.h>
|
#include <command.h>
|
||||||
#include <linux/list.h>
|
#include <linux/list.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <asm/gpio.h>
|
|
||||||
#include <led.h>
|
#include <led.h>
|
||||||
#include <poller.h>
|
#include <poller.h>
|
||||||
#include <clock.h>
|
#include <clock.h>
|
||||||
|
|
|
@ -25,7 +25,6 @@ config I2C_TWLCORE
|
||||||
|
|
||||||
config I2C_TWL4030
|
config I2C_TWL4030
|
||||||
depends on I2C
|
depends on I2C
|
||||||
depends on USB_TWL4030
|
|
||||||
select I2C_TWLCORE
|
select I2C_TWLCORE
|
||||||
bool "TWL4030 driver"
|
bool "TWL4030 driver"
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@ int mc34704_reg_read(struct mc34704 *mc34704, u8 reg, u8 *val)
|
||||||
|
|
||||||
return ret == 1 ? 0 : ret;
|
return ret == 1 ? 0 : ret;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(mc34704_reg_read)
|
EXPORT_SYMBOL(mc34704_reg_read);
|
||||||
|
|
||||||
int mc34704_reg_write(struct mc34704 *mc34704, u8 reg, u8 val)
|
int mc34704_reg_write(struct mc34704 *mc34704, u8 reg, u8 val)
|
||||||
{
|
{
|
||||||
|
@ -62,7 +62,7 @@ int mc34704_reg_write(struct mc34704 *mc34704, u8 reg, u8 val)
|
||||||
|
|
||||||
return ret == 1 ? 0 : ret;
|
return ret == 1 ? 0 : ret;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(mc34704_reg_write)
|
EXPORT_SYMBOL(mc34704_reg_write);
|
||||||
|
|
||||||
static ssize_t mc34704_read(struct cdev *cdev, void *_buf, size_t count,
|
static ssize_t mc34704_read(struct cdev *cdev, void *_buf, size_t count,
|
||||||
loff_t offset, ulong flags)
|
loff_t offset, ulong flags)
|
||||||
|
|
|
@ -51,7 +51,7 @@ int mc9sdz60_reg_read(struct mc9sdz60 *mc9sdz60, enum mc9sdz60_reg reg, u8 *val)
|
||||||
|
|
||||||
return ret == 1 ? 0 : ret;
|
return ret == 1 ? 0 : ret;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(mc9sdz60_reg_read)
|
EXPORT_SYMBOL(mc9sdz60_reg_read);
|
||||||
|
|
||||||
int mc9sdz60_reg_write(struct mc9sdz60 *mc9sdz60, enum mc9sdz60_reg reg, u8 val)
|
int mc9sdz60_reg_write(struct mc9sdz60 *mc9sdz60, enum mc9sdz60_reg reg, u8 val)
|
||||||
{
|
{
|
||||||
|
@ -61,7 +61,7 @@ int mc9sdz60_reg_write(struct mc9sdz60 *mc9sdz60, enum mc9sdz60_reg reg, u8 val)
|
||||||
|
|
||||||
return ret == 1 ? 0 : ret;
|
return ret == 1 ? 0 : ret;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(mc9sdz60_reg_write)
|
EXPORT_SYMBOL(mc9sdz60_reg_write);
|
||||||
|
|
||||||
int mc9sdz60_set_bits(struct mc9sdz60 *mc9sdz60, enum mc9sdz60_reg reg, u8 mask, u8 val)
|
int mc9sdz60_set_bits(struct mc9sdz60 *mc9sdz60, enum mc9sdz60_reg reg, u8 mask, u8 val)
|
||||||
{
|
{
|
||||||
|
|
|
@ -105,38 +105,6 @@ config MTD_NAND_MUSEUM_IDS
|
||||||
config MTD_NAND_IDS
|
config MTD_NAND_IDS
|
||||||
tristate
|
tristate
|
||||||
|
|
||||||
config MTD_NAND_DISKONCHIP
|
|
||||||
tristate "DiskOnChip 2000, Millennium and Millennium Plus"
|
|
||||||
depends on EXPERIMENTAL && BROKEN
|
|
||||||
help
|
|
||||||
This is a reimplementation of M-Systems DiskOnChip 2000,
|
|
||||||
Millennium and Millennium Plus as a standard NAND device driver,
|
|
||||||
as opposed to the earlier self-contained MTD device drivers.
|
|
||||||
This should enable, among other things, proper JFFS2 operation on
|
|
||||||
these devices.
|
|
||||||
|
|
||||||
config MTD_NAND_DISKONCHIP_BBTWRITE
|
|
||||||
bool "Allow BBT writes on DiskOnChip Millennium and 2000TSOP"
|
|
||||||
depends on MTD_NAND_DISKONCHIP
|
|
||||||
help
|
|
||||||
On DiskOnChip devices shipped with the INFTL filesystem (Millennium
|
|
||||||
and 2000 TSOP/Alon), Linux reserves some space at the end of the
|
|
||||||
device for the Bad Block Table (BBT). If you have existing INFTL
|
|
||||||
data on your device (created by non-Linux tools such as M-Systems'
|
|
||||||
DOS drivers), your data might overlap the area Linux wants to use for
|
|
||||||
the BBT. If this is a concern for you, leave this option disabled and
|
|
||||||
Linux will not write BBT data into this area.
|
|
||||||
The downside of leaving this option disabled is that if bad blocks
|
|
||||||
are detected by Linux, they will not be recorded in the BBT, which
|
|
||||||
could cause future problems.
|
|
||||||
Once you enable this option, new filesystems (INFTL or others, created
|
|
||||||
in Linux or other operating systems) will not use the reserved area.
|
|
||||||
The only reason not to enable this option is to prevent damage to
|
|
||||||
preexisting filesystems.
|
|
||||||
Even if you leave this disabled, you can enable BBT writes at module
|
|
||||||
load time (assuming you build diskonchip as a module) with the module
|
|
||||||
parameter "inftl_bbt_write=1".
|
|
||||||
|
|
||||||
config MTD_NAND_NOMADIK
|
config MTD_NAND_NOMADIK
|
||||||
tristate "ST Nomadik 8815 NAND support"
|
tristate "ST Nomadik 8815 NAND support"
|
||||||
depends on ARCH_NOMADIK
|
depends on ARCH_NOMADIK
|
||||||
|
|
|
@ -9,7 +9,6 @@ obj-$(CONFIG_MTD_NAND_IDS) += nand_ids.o
|
||||||
obj-$(CONFIG_NAND) += nand_base.o nand-bb.o
|
obj-$(CONFIG_NAND) += nand_base.o nand-bb.o
|
||||||
obj-$(CONFIG_NAND_BBT) += nand_bbt.o
|
obj-$(CONFIG_NAND_BBT) += nand_bbt.o
|
||||||
|
|
||||||
obj-$(CONFIG_MTD_NAND_DISKONCHIP) += diskonchip.o
|
|
||||||
obj-$(CONFIG_MTD_NAND_NOMADIK) += nomadik_nand.o
|
obj-$(CONFIG_MTD_NAND_NOMADIK) += nomadik_nand.o
|
||||||
obj-$(CONFIG_NAND_IMX) += nand_imx.o
|
obj-$(CONFIG_NAND_IMX) += nand_imx.o
|
||||||
obj-$(CONFIG_NAND_OMAP_GPMC) += nand_omap_gpmc.o nand_omap_bch_decoder.o
|
obj-$(CONFIG_NAND_OMAP_GPMC) += nand_omap_gpmc.o nand_omap_bch_decoder.o
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -254,6 +254,7 @@ static int scan_read_raw(struct mtd_info *mtd, uint8_t *buf, loff_t offs,
|
||||||
/*
|
/*
|
||||||
* Scan write data with oob to flash
|
* Scan write data with oob to flash
|
||||||
*/
|
*/
|
||||||
|
#ifdef CONFIG_MTD_WRITE
|
||||||
static int scan_write_bbt(struct mtd_info *mtd, loff_t offs, size_t len,
|
static int scan_write_bbt(struct mtd_info *mtd, loff_t offs, size_t len,
|
||||||
uint8_t *buf, uint8_t *oob)
|
uint8_t *buf, uint8_t *oob)
|
||||||
{
|
{
|
||||||
|
@ -268,6 +269,7 @@ static int scan_write_bbt(struct mtd_info *mtd, loff_t offs, size_t len,
|
||||||
|
|
||||||
return mtd->write_oob(mtd, offs, &ops);
|
return mtd->write_oob(mtd, offs, &ops);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* read_abs_bbts - [GENERIC] Read the bad block table(s) for all chips starting at a given page
|
* read_abs_bbts - [GENERIC] Read the bad block table(s) for all chips starting at a given page
|
||||||
|
|
|
@ -366,7 +366,7 @@ static void syndrome(unsigned int select_4_8,
|
||||||
* Number of errors that can be corrected: 4- or 8-bits
|
* Number of errors that can be corrected: 4- or 8-bits
|
||||||
* Length of information bit: kk = nn - rr
|
* Length of information bit: kk = nn - rr
|
||||||
*/
|
*/
|
||||||
int decode_bch(int select_4_8, unsigned char *ecc, unsigned int *err_loc)
|
int omap_gpmc_decode_bch(int select_4_8, unsigned char *ecc, unsigned int *err_loc)
|
||||||
{
|
{
|
||||||
int no_of_err;
|
int no_of_err;
|
||||||
unsigned int syn[16] = {0,}; /* 16 Syndromes */
|
unsigned int syn[16] = {0,}; /* 16 Syndromes */
|
||||||
|
|
|
@ -90,7 +90,7 @@
|
||||||
#define GPMC_ECC_SIZE_CONFIG_ECCSIZE0(x) ((x) << 12)
|
#define GPMC_ECC_SIZE_CONFIG_ECCSIZE0(x) ((x) << 12)
|
||||||
#define GPMC_ECC_SIZE_CONFIG_ECCSIZE1(x) ((x) << 22)
|
#define GPMC_ECC_SIZE_CONFIG_ECCSIZE1(x) ((x) << 22)
|
||||||
|
|
||||||
int decode_bch(int select_4_8, unsigned char *ecc, unsigned int *err_loc);
|
int omap_gpmc_decode_bch(int select_4_8, unsigned char *ecc, unsigned int *err_loc);
|
||||||
|
|
||||||
static char *ecc_mode_strings[] = {
|
static char *ecc_mode_strings[] = {
|
||||||
"software",
|
"software",
|
||||||
|
@ -400,7 +400,7 @@ static int omap_correct_bch(struct mtd_info *mtd, uint8_t *dat,
|
||||||
|
|
||||||
count = 0;
|
count = 0;
|
||||||
if (eccflag == 1) {
|
if (eccflag == 1) {
|
||||||
count = decode_bch(select_4_8, calc_ecc, err_loc);
|
count = omap_gpmc_decode_bch(select_4_8, calc_ecc, err_loc);
|
||||||
if (count < 0)
|
if (count < 0)
|
||||||
return count;
|
return count;
|
||||||
else
|
else
|
||||||
|
|
|
@ -72,7 +72,7 @@ int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
|
||||||
chip->bbt[block >> 2] |= 0x01 << ((block & 0x03) << 1);
|
chip->bbt[block >> 2] |= 0x01 << ((block & 0x03) << 1);
|
||||||
|
|
||||||
/* Do we have a flash based bad block table ? */
|
/* Do we have a flash based bad block table ? */
|
||||||
if (chip->options & NAND_USE_FLASH_BBT)
|
if (IS_ENABLED(CONFIG_NAND_BBT) && chip->options & NAND_USE_FLASH_BBT)
|
||||||
ret = nand_update_bbt(mtd, ofs);
|
ret = nand_update_bbt(mtd, ofs);
|
||||||
else {
|
else {
|
||||||
/* We write two bytes, so we dont have to mess with 16 bit
|
/* We write two bytes, so we dont have to mess with 16 bit
|
||||||
|
@ -711,6 +711,9 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
|
||||||
if (bbt_masked_page == 0xffffffff || ret)
|
if (bbt_masked_page == 0xffffffff || ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
if (!IS_ENABLED(CONFIG_NAND_BBT))
|
||||||
|
return ret;
|
||||||
|
|
||||||
for (chipnr = 0; chipnr < chip->numchips; chipnr++) {
|
for (chipnr = 0; chipnr < chip->numchips; chipnr++) {
|
||||||
if (!rewrite_bbt[chipnr])
|
if (!rewrite_bbt[chipnr])
|
||||||
continue;
|
continue;
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
config UBI
|
config UBI
|
||||||
bool "UBI support "
|
bool "UBI support "
|
||||||
select PARTITION_NEED_MTD
|
select PARTITION_NEED_MTD
|
||||||
|
select CRC32
|
||||||
help
|
help
|
||||||
This enables support for UBI (unsorted block images)
|
This enables support for UBI (unsorted block images)
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,7 @@ if PWM
|
||||||
config PWM_PXA
|
config PWM_PXA
|
||||||
bool "PXA PWM Support"
|
bool "PXA PWM Support"
|
||||||
default y if ARCH_PXA2XX
|
default y if ARCH_PXA2XX
|
||||||
|
depends on ARCH_PXA2XX
|
||||||
help
|
help
|
||||||
This enables PWM support for Intel/Marvell PXA chips, such
|
This enables PWM support for Intel/Marvell PXA chips, such
|
||||||
as the PXA25x, PXA27x.
|
as the PXA25x, PXA27x.
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
menuconfig USB_GADGET
|
menuconfig USB_GADGET
|
||||||
|
depends on USB_HAVE_GADGET_DRIVER
|
||||||
bool "USB gadget support "
|
bool "USB gadget support "
|
||||||
|
|
||||||
|
config USB_HAVE_GADGET_DRIVER
|
||||||
|
bool
|
||||||
|
default y if ARCH_IMX || ARCH_MXS || ARCH_AT91 || ARCH_PXA
|
||||||
|
|
||||||
if USB_GADGET
|
if USB_GADGET
|
||||||
|
|
||||||
config USB_GADGET_DUALSPEED
|
config USB_GADGET_DUALSPEED
|
||||||
|
@ -12,7 +17,7 @@ choice
|
||||||
config USB_GADGET_DRIVER_ARC
|
config USB_GADGET_DRIVER_ARC
|
||||||
bool
|
bool
|
||||||
prompt "Arc OTG device core"
|
prompt "Arc OTG device core"
|
||||||
depends on ARCH_IMX
|
depends on ARCH_IMX || ARCH_MXS
|
||||||
select USB_GADGET_DUALSPEED
|
select USB_GADGET_DUALSPEED
|
||||||
select POLLER
|
select POLLER
|
||||||
|
|
||||||
|
|
|
@ -17,10 +17,12 @@
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <init.h>
|
#include <init.h>
|
||||||
|
#include <gpio.h>
|
||||||
#include <clock.h>
|
#include <clock.h>
|
||||||
#include <usb/ch9.h>
|
#include <usb/ch9.h>
|
||||||
#include <usb/gadget.h>
|
#include <usb/gadget.h>
|
||||||
#include <poller.h>
|
#include <poller.h>
|
||||||
|
#include <gpio.h>
|
||||||
|
|
||||||
#include <linux/list.h>
|
#include <linux/list.h>
|
||||||
#include <linux/clk.h>
|
#include <linux/clk.h>
|
||||||
|
@ -32,7 +34,6 @@
|
||||||
#include <mach/io.h>
|
#include <mach/io.h>
|
||||||
#include <mach/board.h>
|
#include <mach/board.h>
|
||||||
#include <mach/cpu.h>
|
#include <mach/cpu.h>
|
||||||
#include <mach/gpio.h>
|
|
||||||
#include <mach/at91sam9261_matrix.h>
|
#include <mach/at91sam9261_matrix.h>
|
||||||
|
|
||||||
#include "at91_udc.h"
|
#include "at91_udc.h"
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
config USB_ULPI
|
config USB_ULPI
|
||||||
bool "ULPI Tranceiver support"
|
bool "ULPI Transceiver support"
|
||||||
help
|
help
|
||||||
Support for tranceivers that conforms ULPI specification.
|
Support for transceivers that conforms ULPI specification.
|
||||||
|
|
||||||
config USB_TWL4030
|
config USB_TWL4030
|
||||||
bool "TWL4030 Tranceiver support"
|
depends on I2C_TWL4030
|
||||||
|
bool "TWL4030 Transceiver support"
|
||||||
|
|
|
@ -25,6 +25,7 @@ config FS_TFTP
|
||||||
depends on NET
|
depends on NET
|
||||||
|
|
||||||
config FS_NFS
|
config FS_NFS
|
||||||
|
depends on NET
|
||||||
bool
|
bool
|
||||||
prompt "nfs support"
|
prompt "nfs support"
|
||||||
|
|
||||||
|
|
|
@ -1 +1,14 @@
|
||||||
|
#ifndef __GPIO_H
|
||||||
|
#define __GPIO_H
|
||||||
|
|
||||||
#include <asm/gpio.h>
|
#include <asm/gpio.h>
|
||||||
|
|
||||||
|
static inline int gpio_request(unsigned gpio, const char *label)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void gpio_free(unsigned gpio)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
#endif /* __GPIO_H */
|
||||||
|
|
Loading…
Reference in New Issue