diff options
Diffstat (limited to 'arch')
109 files changed, 520 insertions, 6611 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 945528c3d7..fa3703627c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -58,7 +58,6 @@ config ARCH_S3C24xx endchoice -source arch/arm/common/Kconfig source arch/arm/cpu/Kconfig source arch/arm/mach-at91/Kconfig source arch/arm/mach-ep93xx/Kconfig diff --git a/arch/arm/Makefile b/arch/arm/Makefile index e542c03c94..77b6cf4551 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -52,6 +52,7 @@ board-$(CONFIG_MACH_A9M2410) := a9m2410 board-$(CONFIG_MACH_A9M2440) := a9m2440 board-$(CONFIG_MACH_AT91SAM9260EK) := at91sam9260ek board-$(CONFIG_MACH_AT91SAM9263EK) := at91sam9263ek +board-$(CONFIG_MACH_AT91SAM9G20EK) := at91sam9260ek board-$(CONFIG_MACH_EDB9301) := edb93xx board-$(CONFIG_MACH_EDB9302) := edb93xx board-$(CONFIG_MACH_EDB9302A) := edb93xx @@ -114,7 +115,7 @@ all: $(KBUILD_IMAGE) archprepare: maketools maketools: - $(Q)$(MAKE) $(build)=arch/arm/tools arch/arm/include/asm/mach-types.h + $(Q)$(MAKE) $(build)=arch/arm/tools include/generated/mach-types.h PHONY += maketools @@ -131,9 +132,9 @@ MACH := endif common-y += $(BOARD) $(MACH) -common-y += arch/arm/lib/ arch/arm/cpu/ arch/arm/common/ +common-y += arch/arm/lib/ arch/arm/cpu/ lds-$(CONFIG_GENERIC_LINKER_SCRIPT) := arch/arm/lib/barebox.lds lds-$(CONFIG_BOARD_LINKER_SCRIPT) := $(BOARD)/barebox.lds -CLEAN_FILES += arch/arm/include/asm/mach-types.h arch/arm/lib/barebox.lds +CLEAN_FILES += include/generated/mach-types.h arch/arm/lib/barebox.lds diff --git a/arch/arm/boards/a9m2410/a9m2410.c b/arch/arm/boards/a9m2410/a9m2410.c index f327f82b7f..57d8fa39fd 100644 --- a/arch/arm/boards/a9m2410/a9m2410.c +++ b/arch/arm/boards/a9m2410/a9m2410.c @@ -28,7 +28,7 @@ #include <driver.h> #include <init.h> #include <asm/armlinux.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <partition.h> #include <nand.h> #include <asm/io.h> @@ -41,6 +41,7 @@ static struct memory_platform_data ram_pdata = { }; static struct device_d sdram_dev = { + .id = -1, .name = "ram", .map_base = CS6_BASE, .platform_data = &ram_pdata, @@ -52,6 +53,7 @@ static struct s3c24x0_nand_platform_data nand_info = { }; static struct device_d nand_dev = { + .id = -1, .name = "s3c24x0_nand", .map_base = S3C24X0_NAND_BASE, .platform_data = &nand_info, @@ -63,6 +65,7 @@ static struct device_d nand_dev = { * GPIO3, data width is 32 bit */ static struct device_d network_dev = { + .id = -1, .name = "smc91c111", .map_base = CS1_BASE + 0x300, .size = 16, @@ -178,6 +181,7 @@ void __bare_init nand_boot(void) #endif static struct device_d a9m2410_serial_device = { + .id = -1, .name = "s3c24x0_serial", .map_base = UART1_BASE, .size = UART1_SIZE, diff --git a/arch/arm/boards/a9m2440/a9m2440.c b/arch/arm/boards/a9m2440/a9m2440.c index 2567f5ed13..764cd65325 100644 --- a/arch/arm/boards/a9m2440/a9m2440.c +++ b/arch/arm/boards/a9m2440/a9m2440.c @@ -28,7 +28,7 @@ #include <driver.h> #include <init.h> #include <asm/armlinux.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <partition.h> #include <nand.h> #include <asm/io.h> @@ -44,6 +44,7 @@ static struct memory_platform_data ram_pdata = { }; static struct device_d sdram_dev = { + .id = -1, .name = "mem", .map_base = CS6_BASE, .platform_data = &ram_pdata, @@ -54,6 +55,7 @@ static struct s3c24x0_nand_platform_data nand_info = { }; static struct device_d nand_dev = { + .id = -1, .name = "s3c24x0_nand", .map_base = S3C24X0_NAND_BASE, .platform_data = &nand_info, @@ -65,6 +67,7 @@ static struct device_d nand_dev = { * data width is 16 bit */ static struct device_d network_dev = { + .id = -1, .name = "cs8900", .map_base = CS5_BASE + (1 << 24) + 0x300, .size = 16, @@ -184,6 +187,7 @@ void __bare_init nand_boot(void) #endif static struct device_d a9m2440_serial_device = { + .id = -1, .name = "s3c24x0_serial", .map_base = UART1_BASE, .size = UART1_SIZE, diff --git a/arch/arm/boards/at91sam9260ek/init.c b/arch/arm/boards/at91sam9260ek/init.c index 9fd75256c6..966dd2fd30 100644 --- a/arch/arm/boards/at91sam9260ek/init.c +++ b/arch/arm/boards/at91sam9260ek/init.c @@ -24,7 +24,7 @@ #include <environment.h> #include <fec.h> #include <asm/armlinux.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <partition.h> #include <fs.h> #include <fcntl.h> @@ -40,6 +40,25 @@ #include <mach/at91_pmc.h> #include <mach/at91_rstc.h> +/* + * board revision encoding + * bit 0: + * 0 => 1 mmc + * 1 => 2 mmcs (board from revision C) + */ +#define HAVE_2MMC (1 << 0) +static void ek_set_board_type(void) +{ + if (machine_is_at91sam9g20ek()) { + armlinux_set_architecture(MACH_TYPE_AT91SAM9G20EK); +#ifdef CONFIG_AT91_HAVE_2MMC + armlinux_set_revision(HAVE_2MMC); +#endif + } else { + armlinux_set_architecture(MACH_TYPE_AT91SAM9260EK); + } +} + static struct atmel_nand_data nand_pdata = { .ale = 21, .cle = 22, @@ -130,7 +149,7 @@ static int at91sam9260ek_devices_init(void) at91_add_device_sdram(64 * 1024 * 1024); armlinux_set_bootparams((void *)(AT91_CHIPSELECT_1 + 0x100)); - armlinux_set_architecture(MACH_TYPE_AT91SAM9260EK); + ek_set_board_type(); devfs_add_partition("nand0", 0x00000, 0x80000, PARTITION_FIXED, "self_raw"); dev_add_bb_dev("self_raw", "self0"); diff --git a/arch/arm/boards/at91sam9263ek/init.c b/arch/arm/boards/at91sam9263ek/init.c index 61cd295396..8448866cdd 100644 --- a/arch/arm/boards/at91sam9263ek/init.c +++ b/arch/arm/boards/at91sam9263ek/init.c @@ -25,7 +25,7 @@ #include <init.h> #include <environment.h> #include <asm/armlinux.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <partition.h> #include <fs.h> #include <fcntl.h> @@ -88,6 +88,7 @@ static void ek_add_device_nand(void) } static struct device_d cfi_dev = { + .id = -1, .name = "cfi_flash", .map_base = AT91_CHIPSELECT_0, .size = 8 * 1024 * 1024, diff --git a/arch/arm/boards/edb93xx/edb93xx.c b/arch/arm/boards/edb93xx/edb93xx.c index b0078a5227..0f127b5c5e 100644 --- a/arch/arm/boards/edb93xx/edb93xx.c +++ b/arch/arm/boards/edb93xx/edb93xx.c @@ -28,7 +28,7 @@ #include <partition.h> #include <asm/armlinux.h> #include <asm/io.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <mach/ep93xx-regs.h> #include "edb93xx.h" @@ -39,6 +39,7 @@ * CS line 6, data width is 16 bit */ static struct device_d cfi_dev = { + .id = -1, .name = "cfi_flash", .map_base = 0x60000000, .size = EDB93XX_CFI_FLASH_SIZE, @@ -50,6 +51,7 @@ static struct memory_platform_data ram_dev_pdata0 = { }; static struct device_d sdram0_dev = { + .id = -1, .name = "mem", .map_base = CONFIG_EP93XX_SDRAM_BANK0_BASE, .size = CONFIG_EP93XX_SDRAM_BANK0_SIZE, @@ -63,6 +65,7 @@ static struct memory_platform_data ram_dev_pdata1 = { }; static struct device_d sdram1_dev = { + .id = -1, .name = "mem", .map_base = CONFIG_EP93XX_SDRAM_BANK1_BASE, .size = CONFIG_EP93XX_SDRAM_BANK1_SIZE, @@ -77,6 +80,7 @@ static struct memory_platform_data ram_dev_pdata2 = { }; static struct device_d sdram2_dev = { + .id = -1, .name = "mem", .map_base = CONFIG_EP93XX_SDRAM_BANK2_BASE, .size = CONFIG_EP93XX_SDRAM_BANK2_SIZE, @@ -91,6 +95,7 @@ static struct memory_platform_data ram_dev_pdata3 = { }; static struct device_d sdram3_dev = { + .id = -1, .name = "mem", .map_base = CONFIG_EP93XX_SDRAM_BANK3_BASE, .size = CONFIG_EP93XX_SDRAM_BANK3_SIZE, @@ -99,6 +104,7 @@ static struct device_d sdram3_dev = { #endif static struct device_d eth_dev = { + .id = -1, .name = "ep93xx_eth", }; @@ -149,6 +155,7 @@ static int ep93xx_devices_init(void) device_initcall(ep93xx_devices_init); static struct device_d edb93xx_serial_device = { + .id = -1, .name = "pl010_serial", .map_base = UART1_BASE, .size = 4096, diff --git a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c index caeb46e872..7fd1031171 100644 --- a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c +++ b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c @@ -33,7 +33,7 @@ #include <asm/mmu.h> #include <partition.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <mach/imx-nand.h> #include <mach/imxfb.h> #include <fec.h> @@ -42,13 +42,14 @@ #include <mach/iomux-mx25.h> extern unsigned long _stext; +extern void exception_vectors(void); void __naked __flash_header_start go(void) { __asm__ __volatile__("b exception_vectors\n"); } -struct imx_dcd_entry __dcd_entry_0x400 dcd_entry[] = { +struct imx_dcd_entry __dcd_entry_section dcd_entry[] = { { .ptr_type = 4, .addr = 0xb8001010, .val = 0x00000004, }, { .ptr_type = 4, .addr = 0xb8001000, .val = 0x92100000, }, { .ptr_type = 1, .addr = 0x80000400, .val = 0x12344321, }, @@ -63,21 +64,21 @@ struct imx_dcd_entry __dcd_entry_0x400 dcd_entry[] = { { .ptr_type = 4, .addr = 0x53f80008, .val = 0x20034000, }, }; -struct imx_flash_header __flash_header_0x400 eukrea_cpuimx25_header = { - .app_code_jump_vector = TEXT_BASE + 0x2000, +struct imx_flash_header __flash_header_section flash_header = { + .app_code_jump_vector = DEST_BASE + ((unsigned int)&exception_vectors - TEXT_BASE), .app_code_barker = APP_CODE_BARKER, .app_code_csf = 0, - .dcd_ptr_ptr = TEXT_BASE + 0x400 + offsetof(struct imx_flash_header, dcd), + .dcd_ptr_ptr = FLASH_HEADER_BASE + offsetof(struct imx_flash_header, dcd), .super_root_key = 0, - .dcd = TEXT_BASE + 0x400 + offsetof(struct imx_flash_header, dcd_barker), - .app_dest = TEXT_BASE, + .dcd = FLASH_HEADER_BASE + offsetof(struct imx_flash_header, dcd_barker), + .app_dest = DEST_BASE, .dcd_barker = DCD_BARKER, .dcd_block_len = sizeof(dcd_entry), }; extern unsigned long __bss_start; -unsigned long __image_len_0x400 barebox_len = 0x40000; +unsigned long __image_len_section barebox_len = 0x40000; static struct fec_platform_data fec_info = { .xcv_type = RMII, @@ -85,6 +86,7 @@ static struct fec_platform_data fec_info = { }; static struct device_d fec_dev = { + .id = -1, .name = "fec_imx", .map_base = IMX_FEC_BASE, .platform_data = &fec_info, @@ -96,6 +98,7 @@ static struct memory_platform_data sdram_pdata = { }; static struct device_d sdram0_dev = { + .id = -1, .name = "mem", .map_base = IMX_SDRAM_CS0, .size = 64 * 1024 * 1024, @@ -108,6 +111,7 @@ struct imx_nand_platform_data nand_info = { }; static struct device_d nand_dev = { + .id = -1, .name = "imx_nand", .map_base = IMX_NFC_BASE, .platform_data = &nand_info, @@ -140,6 +144,7 @@ static struct imx_fb_platform_data eukrea_cpuimx25_fb_data = { static struct device_d imxfb_dev = { + .id = -1, .name = "imxfb", .map_base = 0x53fbc000, .size = 0x1000, @@ -243,6 +248,7 @@ static int eukrea_cpuimx25_devices_init(void) device_initcall(eukrea_cpuimx25_devices_init); static struct device_d eukrea_cpuimx25_serial_device = { + .id = -1, .name = "imx_serial", .map_base = IMX_UART1_BASE, .size = 16 * 1024, diff --git a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c index 1937d21c85..4d1797bca7 100644 --- a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c +++ b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c @@ -30,7 +30,7 @@ #include <notifier.h> #include <mach/gpio.h> #include <asm/armlinux.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <mach/pmic.h> #include <partition.h> #include <fs.h> @@ -48,12 +48,14 @@ #include <mach/iomux-mx27.h> static struct device_d cfi_dev = { + .id = -1, .name = "cfi_flash", .map_base = 0xC0000000, .size = 32 * 1024 * 1024, }; #ifdef CONFIG_EUKREA_CPUIMX27_NOR_64MB static struct device_d cfi_dev1 = { + .id = -1, .name = "cfi_flash", .map_base = 0xC2000000, .size = 32 * 1024 * 1024, @@ -72,6 +74,7 @@ static struct memory_platform_data ram_pdata = { #endif static struct device_d sdram_dev = { + .id = -1, .name = "mem", .map_base = 0xa0000000, .size = SDRAM0 * 1024 * 1024, @@ -84,6 +87,7 @@ static struct fec_platform_data fec_info = { }; static struct device_d fec_dev = { + .id = -1, .name = "fec_imx", .map_base = 0x1002b000, .platform_data = &fec_info, @@ -96,6 +100,7 @@ struct imx_nand_platform_data nand_info = { }; static struct device_d nand_dev = { + .id = -1, .name = "imx_nand", .map_base = 0xd8000000, .platform_data = &nand_info, @@ -137,6 +142,7 @@ static struct NS16550_plat quad_uart_serial_plat = { #endif static struct device_d quad_uart_serial_device = { + .id = -1, .name = "serial_ns16550", .map_base = IMX_CS3_BASE + QUART_OFFSET, .size = 0xF, @@ -151,6 +157,7 @@ static struct i2c_board_info i2c_devices[] = { }; static struct device_d i2c_dev = { + .id = -1, .name = "i2c-imx", .map_base = IMX_I2C1_BASE, }; @@ -204,6 +211,7 @@ static struct imx_fb_platform_data eukrea_cpuimx27_fb_data = { }; static struct device_d imxfb_dev = { + .id = -1, .name = "imxfb", .map_base = 0x10021000, .size = 0x1000, @@ -316,6 +324,7 @@ device_initcall(eukrea_cpuimx27_devices_init); #ifdef CONFIG_DRIVER_SERIAL_IMX static struct device_d eukrea_cpuimx27_serial_device = { + .id = -1, .name = "imx_serial", .map_base = IMX_UART1_BASE, .size = 4096, @@ -342,14 +351,14 @@ console_initcall(eukrea_cpuimx27_console_init); static int eukrea_cpuimx27_late_init(void) { -#ifdef CONFIG_DRIVER_I2C_LP3972 +#ifdef CONFIG_I2C_LP3972 struct i2c_client *client; u8 reg[1]; #endif console_flush(); register_device(&fec_dev); -#ifdef CONFIG_DRIVER_I2C_LP3972 +#ifdef CONFIG_I2C_LP3972 client = lp3972_get_client(); if (!client) return -ENODEV; diff --git a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c index d41d9b548e..63d019a045 100644 --- a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c +++ b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c @@ -40,7 +40,7 @@ #include <asm/armlinux.h> #include <asm/io.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <asm/mmu.h> #include <mach/gpio.h> @@ -58,6 +58,7 @@ static struct fec_platform_data fec_info = { }; static struct device_d fec_dev = { + .id = -1, .name = "fec_imx", .map_base = IMX_FEC_BASE, .platform_data = &fec_info, @@ -69,6 +70,7 @@ static struct memory_platform_data sdram_pdata = { }; static struct device_d sdram_dev = { + .id = -1, .name = "mem", .map_base = IMX_SDRAM_CS0, .size = 128 * 1024 * 1024, @@ -82,6 +84,7 @@ struct imx_nand_platform_data nand_info = { }; static struct device_d nand_dev = { + .id = -1, .name = "imx_nand", .map_base = IMX_NFC_BASE, .platform_data = &nand_info, @@ -116,6 +119,7 @@ static struct imx_ipu_fb_platform_data ipu_fb_data = { }; static struct device_d imxfb_dev = { + .id = -1, .name = "imx-ipu-fb", .map_base = 0x53fc0000, .size = 0x1000, @@ -171,6 +175,7 @@ static int eukrea_cpuimx35_devices_init(void) device_initcall(eukrea_cpuimx35_devices_init); static struct device_d eukrea_cpuimx35_serial_device = { + .id = -1, .name = "imx_serial", .map_base = IMX_UART1_BASE, .size = 4096, diff --git a/arch/arm/boards/eukrea_cpuimx35/flash_header.c b/arch/arm/boards/eukrea_cpuimx35/flash_header.c index 78f51f670c..285a2d4a96 100644 --- a/arch/arm/boards/eukrea_cpuimx35/flash_header.c +++ b/arch/arm/boards/eukrea_cpuimx35/flash_header.c @@ -1,12 +1,15 @@ #include <common.h> #include <mach/imx-flash-header.h> +#include <mach/imx-regs.h> + +extern void exception_vectors(void); void __naked __flash_header_start go(void) { __asm__ __volatile__("b exception_vectors\n"); } -struct imx_dcd_entry __dcd_entry_0x400 dcd_entry[] = { +struct imx_dcd_entry __dcd_entry_section dcd_entry[] = { { .ptr_type = 4, .addr = 0x53F80004, .val = 0x00821000, }, { .ptr_type = 4, .addr = 0x53F80004, .val = 0x00821000, }, { .ptr_type = 4, .addr = 0xB8001010, .val = 0x00000004, }, @@ -24,18 +27,17 @@ struct imx_dcd_entry __dcd_entry_0x400 dcd_entry[] = { { .ptr_type = 4, .addr = 0xB8001010, .val = 0x00000004, }, }; -#define APP_DEST 0x80000000 -struct imx_flash_header __flash_header_0x400 eukrea_cpuimx35_header = { - .app_code_jump_vector = APP_DEST + 0x1000, +struct imx_flash_header __flash_header_section flash_header = { + .app_code_jump_vector = DEST_BASE + ((unsigned int)&exception_vectors - TEXT_BASE), .app_code_barker = APP_CODE_BARKER, .app_code_csf = 0, - .dcd_ptr_ptr = APP_DEST + 0x400 + offsetof(struct imx_flash_header, dcd), + .dcd_ptr_ptr = FLASH_HEADER_BASE + offsetof(struct imx_flash_header, dcd), .super_root_key = 0, - .dcd = APP_DEST + 0x400 + offsetof(struct imx_flash_header, dcd_barker), - .app_dest = APP_DEST, + .dcd = FLASH_HEADER_BASE + offsetof(struct imx_flash_header, dcd_barker), + .app_dest = DEST_BASE, .dcd_barker = DCD_BARKER, - .dcd_block_len = sizeof (dcd_entry), + .dcd_block_len = sizeof(dcd_entry), }; -unsigned long __image_len_0x400 barebox_len = 0x40000; +unsigned long __image_len_section barebox_len = 0x40000; diff --git a/arch/arm/boards/freescale-mx25-3-stack/3stack.c b/arch/arm/boards/freescale-mx25-3-stack/3stack.c index cd228cc470..70de7958eb 100644 --- a/arch/arm/boards/freescale-mx25-3-stack/3stack.c +++ b/arch/arm/boards/freescale-mx25-3-stack/3stack.c @@ -30,7 +30,7 @@ #include <mach/gpio.h> #include <asm/io.h> #include <partition.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <mach/imx-nand.h> #include <fec.h> #include <nand.h> @@ -42,13 +42,14 @@ #include <i2c/mc34704.h> extern unsigned long _stext; +extern void exception_vectors(void); void __naked __flash_header_start go(void) { __asm__ __volatile__("b exception_vectors\n"); } -struct imx_dcd_entry __dcd_entry_0x400 dcd_entry[] = { +struct imx_dcd_entry __dcd_entry_section dcd_entry[] = { { .ptr_type = 4, .addr = 0xb8002050, .val = 0x0000d843, }, { .ptr_type = 4, .addr = 0xb8002054, .val = 0x22252521, }, { .ptr_type = 4, .addr = 0xb8002058, .val = 0x22220a00, }, @@ -90,23 +91,21 @@ struct imx_dcd_entry __dcd_entry_0x400 dcd_entry[] = { { .ptr_type = 4, .addr = 0x53f80008, .val = 0x20034000, }, }; -#define APP_DEST 0x80000000 - -struct imx_flash_header __flash_header_0x400 mx25_3ds_header = { - .app_code_jump_vector = APP_DEST + 0x1000, +struct imx_flash_header __flash_header_section flash_header = { + .app_code_jump_vector = DEST_BASE + ((unsigned int)&exception_vectors - TEXT_BASE), .app_code_barker = APP_CODE_BARKER, .app_code_csf = 0, - .dcd_ptr_ptr = APP_DEST + 0x400 + offsetof(struct imx_flash_header, dcd), + .dcd_ptr_ptr = FLASH_HEADER_BASE + offsetof(struct imx_flash_header, dcd), .super_root_key = 0, - .dcd = APP_DEST + 0x400 + offsetof(struct imx_flash_header, dcd_barker), - .app_dest = APP_DEST, + .dcd = FLASH_HEADER_BASE + offsetof(struct imx_flash_header, dcd_barker), + .app_dest = DEST_BASE, .dcd_barker = DCD_BARKER, - .dcd_block_len = sizeof (dcd_entry), + .dcd_block_len = sizeof(dcd_entry), }; extern unsigned long __bss_start; -unsigned long __image_len_0x400 barebox_len = 0x40000; +unsigned long __image_len_section barebox_len = 0x40000; static struct fec_platform_data fec_info = { .xcv_type = RMII, @@ -114,6 +113,7 @@ static struct fec_platform_data fec_info = { }; static struct device_d fec_dev = { + .id = -1, .name = "fec_imx", .map_base = IMX_FEC_BASE, .platform_data = &fec_info, @@ -125,6 +125,7 @@ static struct memory_platform_data sdram_pdata = { }; static struct device_d sdram0_dev = { + .id = -1, .name = "mem", .map_base = IMX_SDRAM_CS0, #if defined CONFIG_FREESCALE_MX25_3STACK_SDRAM_64MB_DDR2 @@ -143,6 +144,7 @@ static struct memory_platform_data sram_pdata = { }; static struct device_d sram0_dev = { + .id = -1, .name = "mem", .map_base = 0x78000000, .size = 128 * 1024, @@ -155,6 +157,7 @@ struct imx_nand_platform_data nand_info = { }; static struct device_d nand_dev = { + .id = -1, .name = "imx_nand", .map_base = IMX_NFC_BASE, .platform_data = &nand_info, @@ -181,6 +184,7 @@ static void imx25_usb_init(void) } static struct device_d usbh2_dev = { + .id = -1, .name = "ehci", .map_base = IMX_OTG_BASE + 0x400, .size = 0x200, @@ -194,6 +198,7 @@ static struct i2c_board_info i2c_devices[] = { }; static struct device_d i2c_dev = { + .id = -1, .name = "i2c-imx", .map_base = IMX_I2C1_BASE, }; @@ -284,6 +289,7 @@ static int imx25_devices_init(void) device_initcall(imx25_devices_init); static struct device_d imx25_serial_device = { + .id = -1, .name = "imx_serial", .map_base = IMX_UART1_BASE, .size = 16 * 1024, diff --git a/arch/arm/boards/freescale-mx35-3-stack/3stack.c b/arch/arm/boards/freescale-mx35-3-stack/3stack.c index 9a66976f9d..71aaa92970 100644 --- a/arch/arm/boards/freescale-mx35-3-stack/3stack.c +++ b/arch/arm/boards/freescale-mx35-3-stack/3stack.c @@ -38,7 +38,7 @@ #include <asm/armlinux.h> #include <asm/io.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <mach/gpio.h> #include <mach/imx-nand.h> @@ -59,6 +59,7 @@ #define MX35PDK_BOARD_REV_2 1 static struct device_d cfi_dev = { + .id = -1, .name = "cfi_flash", .map_base = IMX_CS0_BASE, .size = 64 * 1024 * 1024, @@ -70,6 +71,7 @@ static struct fec_platform_data fec_info = { }; static struct device_d fec_dev = { + .id = -1, .name = "fec_imx", .map_base = IMX_FEC_BASE, .platform_data = &fec_info, @@ -81,6 +83,7 @@ static struct memory_platform_data sdram_pdata = { }; static struct device_d sdram_dev = { + .id = -1, .name = "mem", .map_base = IMX_SDRAM_CS0, .size = 128 * 1024 * 1024, @@ -93,12 +96,14 @@ struct imx_nand_platform_data nand_info = { }; static struct device_d nand_dev = { + .id = -1, .name = "imx_nand", .map_base = IMX_NFC_BASE, .platform_data = &nand_info, }; static struct device_d smc911x_dev = { + .id = -1, .name = "smc911x", .map_base = IMX_CS5_BASE, .size = IMX_CS5_RANGE, @@ -113,6 +118,7 @@ static struct i2c_board_info i2c_devices[] = { }; static struct device_d i2c_dev = { + .id = -1, .name = "i2c-imx", .map_base = IMX_I2C1_BASE, }; @@ -144,6 +150,7 @@ static struct imx_ipu_fb_platform_data ipu_fb_data = { }; static struct device_d imxfb_dev = { + .id = -1, .name = "imx-ipu-fb", .map_base = 0x53fc0000, .size = 0x1000, @@ -244,6 +251,7 @@ static int f3s_enable_display(void) late_initcall(f3s_enable_display); static struct device_d f3s_serial_device = { + .id = -1, .name = "imx_serial", .map_base = IMX_UART1_BASE, .size = 4096, diff --git a/arch/arm/boards/freescale-mx35-3-stack/flash_header.c b/arch/arm/boards/freescale-mx35-3-stack/flash_header.c index 171c499a6d..4bee7971a9 100644 --- a/arch/arm/boards/freescale-mx35-3-stack/flash_header.c +++ b/arch/arm/boards/freescale-mx35-3-stack/flash_header.c @@ -1,14 +1,15 @@ #include <common.h> #include <mach/imx-flash-header.h> +#include <mach/imx-regs.h> -extern unsigned long _stext; +extern void exception_vectors(void); void __naked __flash_header_start go(void) { __asm__ __volatile__("b exception_vectors\n"); } -struct imx_dcd_entry __dcd_entry_0x400 dcd_entry[] = { +struct imx_dcd_entry __dcd_entry_section dcd_entry[] = { { .ptr_type = 4, .addr = 0xb8002050, .val = 0x0000d843, }, { .ptr_type = 4, .addr = 0xB8002054, .val = 0x22252521, }, { .ptr_type = 4, .addr = 0xB8002058, .val = 0x22220a00, }, @@ -31,19 +32,18 @@ struct imx_dcd_entry __dcd_entry_0x400 dcd_entry[] = { { .ptr_type = 4, .addr = 0xB8001008, .val = 0x00002000, }, }; -#define APP_DEST 0x80000000 -struct imx_flash_header __flash_header_0x400 flash_header = { - .app_code_jump_vector = APP_DEST + 0x1000, +struct imx_flash_header __flash_header_section flash_header = { + .app_code_jump_vector = DEST_BASE + ((unsigned int)&exception_vectors - TEXT_BASE), .app_code_barker = APP_CODE_BARKER, .app_code_csf = 0, - .dcd_ptr_ptr = APP_DEST + 0x400 + offsetof(struct imx_flash_header, dcd), + .dcd_ptr_ptr = FLASH_HEADER_BASE + offsetof(struct imx_flash_header, dcd), .super_root_key = 0, - .dcd = APP_DEST + 0x400 + offsetof(struct imx_flash_header, dcd_barker), - .app_dest = APP_DEST, + .dcd = FLASH_HEADER_BASE + offsetof(struct imx_flash_header, dcd_barker), + .app_dest = DEST_BASE, .dcd_barker = DCD_BARKER, - .dcd_block_len = sizeof (dcd_entry), + .dcd_block_len = sizeof(dcd_entry), }; -unsigned long __image_len_0x400 barebox_len = 0x40000; +unsigned long __image_len_section barebox_len = 0x40000; diff --git a/arch/arm/boards/guf-neso/board.c b/arch/arm/boards/guf-neso/board.c index 2f53d34556..9c85c0869e 100644 --- a/arch/arm/boards/guf-neso/board.c +++ b/arch/arm/boards/guf-neso/board.c @@ -35,7 +35,7 @@ #include <asm/io.h> #include <asm/mmu.h> #include <asm/armlinux.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <mach/gpio.h> #include <mach/spi.h> @@ -59,6 +59,7 @@ static struct memory_platform_data ram_pdata = { }; static struct device_d sdram_dev = { + .id = -1, .name = "mem", .map_base = 0xa0000000, .size = 128 * 1024 * 1024, @@ -71,6 +72,7 @@ static struct fec_platform_data fec_info = { }; static struct device_d fec_dev = { + .id = -1, .name = "fec_imx", .map_base = 0x1002b000, .platform_data = &fec_info, @@ -83,6 +85,7 @@ static struct imx_nand_platform_data nand_info = { }; static struct device_d nand_dev = { + .id = -1, .name = "imx_nand", .map_base = 0xd8000000, .platform_data = &nand_info, @@ -137,6 +140,7 @@ static struct imx_fb_platform_data neso_fb_data = { }; static struct device_d imxfb_dev = { + .id = -1, .name = "imxfb", .map_base = 0x10021000, .size = 0x1000, @@ -146,6 +150,7 @@ static struct device_d imxfb_dev = { #ifdef CONFIG_USB static struct device_d usbh2_dev = { + .id = -1, .name = "ehci", .map_base = IMX_OTG_BASE + 0x400, .size = 0x200, @@ -356,6 +361,7 @@ static int neso_devices_init(void) device_initcall(neso_devices_init); static struct device_d neso_serial_device = { + .id = -1, .name = "imx_serial", .map_base = IMX_UART1_BASE, .size = 4096, diff --git a/arch/arm/boards/imx21ads/imx21ads.c b/arch/arm/boards/imx21ads/imx21ads.c index 5e88af4fd8..44d37aad4f 100644 --- a/arch/arm/boards/imx21ads/imx21ads.c +++ b/arch/arm/boards/imx21ads/imx21ads.c @@ -32,7 +32,7 @@ #include <partition.h> #include <fs.h> #include <fcntl.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <mach/imx-nand.h> #include <mach/imxfb.h> #include <mach/iomux-mx21.h> @@ -41,6 +41,7 @@ #define MX21ADS_IO_LCDON (1 << 9) static struct device_d cfi_dev = { + .id = -1, .name = "cfi_flash", .map_base = 0xC8000000, .size = 32 * 1024 * 1024, @@ -52,6 +53,7 @@ static struct memory_platform_data ram_pdata = { }; static struct device_d sdram_dev = { + .id = -1, .name = "mem", .map_base = 0xc0000000, .size = 64 * 1024 * 1024, @@ -64,12 +66,14 @@ struct imx_nand_platform_data nand_info = { }; static struct device_d nand_dev = { + .id = -1, .name = "imx_nand", .map_base = 0xDF003000, .platform_data = &nand_info, }; static struct device_d cs8900_dev = { + .id = -1, .name = "cs8900", .map_base = IMX_CS1_BASE, // IRQ is connected to UART3_RTS @@ -108,6 +112,7 @@ static struct imx_fb_platform_data imx_fb_data = { }; static struct device_d imxfb_dev = { + .id = -1, .name = "imxfb", .map_base = 0x10021000, .size = 0x1000, @@ -220,6 +225,7 @@ static int mx21ads_enable_display(void) late_initcall(mx21ads_enable_display); static struct device_d mx21ads_serial_device = { + .id = -1, .name = "imx_serial", .map_base = IMX_UART1_BASE, .size = 4096, diff --git a/arch/arm/boards/imx27ads/imx27ads.c b/arch/arm/boards/imx27ads/imx27ads.c index 6f31520ffa..ae5da7fd63 100644 --- a/arch/arm/boards/imx27ads/imx27ads.c +++ b/arch/arm/boards/imx27ads/imx27ads.c @@ -30,10 +30,11 @@ #include <partition.h> #include <fs.h> #include <fcntl.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <mach/iomux-mx27.h> static struct device_d cfi_dev = { + .id = -1, .name = "cfi_flash", .map_base = 0xC0000000, .size = 32 * 1024 * 1024, @@ -45,6 +46,7 @@ static struct memory_platform_data ram_pdata = { }; static struct device_d sdram_dev = { + .id = -1, .name = "mem", .map_base = 0xa0000000, .size = 128 * 1024 * 1024, @@ -57,6 +59,7 @@ static struct fec_platform_data fec_info = { }; static struct device_d fec_dev = { + .id = -1, .name = "fec_imx", .map_base = 0x1002b000, .platform_data = &fec_info, @@ -147,6 +150,7 @@ static int mx27ads_devices_init(void) device_initcall(mx27ads_devices_init); static struct device_d mx27ads_serial_device = { + .id = -1, .name = "imx_serial", .map_base = IMX_UART1_BASE, .size = 4096, diff --git a/arch/arm/boards/mmccpu/init.c b/arch/arm/boards/mmccpu/init.c index 9a7d930b6d..7cba01c4f0 100644 --- a/arch/arm/boards/mmccpu/init.c +++ b/arch/arm/boards/mmccpu/init.c @@ -24,7 +24,7 @@ #include <environment.h> #include <fec.h> #include <asm/armlinux.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <partition.h> #include <fs.h> #include <fcntl.h> @@ -38,6 +38,7 @@ #include <mach/io.h> static struct device_d cfi_dev = { + .id = -1, .name = "cfi_flash", .map_base = AT91_CHIPSELECT_0, .size = 0, /* zero means autodetect size */ diff --git a/arch/arm/boards/netx/netx.c b/arch/arm/boards/netx/netx.c index d6bfcca54d..c735d26bc4 100644 --- a/arch/arm/boards/netx/netx.c +++ b/arch/arm/boards/netx/netx.c @@ -27,10 +27,11 @@ #include <asm/armlinux.h> #include <fs.h> #include <fcntl.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <mach/netx-eth.h> static struct device_d cfi_dev = { + .id = -1, .name = "cfi_flash", .map_base = 0xC0000000, .size = 32 * 1024 * 1024, @@ -42,6 +43,7 @@ static struct memory_platform_data ram_pdata = { }; static struct device_d sdram_dev = { + .id = -1, .name = "mem", .map_base = 0x80000000, .size = 64 * 1024 * 1024, @@ -53,6 +55,7 @@ struct netx_eth_platform_data eth0_data = { }; static struct device_d netx_eth_dev0 = { + .id = -1, .name = "netx-eth", .platform_data = ð0_data, }; @@ -62,6 +65,7 @@ struct netx_eth_platform_data eth1_data = { }; static struct device_d netx_eth_dev1 = { + .id = -1, .name = "netx-eth", .platform_data = ð1_data, }; @@ -89,6 +93,7 @@ static int netx_devices_init(void) { device_initcall(netx_devices_init); static struct device_d netx_serial_device = { + .id = -1, .name = "netx_serial", .map_base = NETX_PA_UART0, .size = 0x40, diff --git a/arch/arm/boards/nhk8815/env/config b/arch/arm/boards/nhk8815/env/config index 2b50b25ec5..7e7fc456c3 100644 --- a/arch/arm/boards/nhk8815/env/config +++ b/arch/arm/boards/nhk8815/env/config @@ -20,7 +20,7 @@ ip=dhcp # JFFS2 Root filesystem 22MB 0x00580000 # JFFS2 User Data 100MB 0x01b80000 -nand_parts="256k(xloader)ro,256k(meminit),2M(uboot),3M(kernel),22M(rootfs),100M(userfs),384k(free),128k(ubootenv)" +nand_parts="256k(xloader)ro,256k(meminit),2M(barebox),3M(kernel),22M(rootfs),100M(userfs),384k(free),128k(bareboxenv)" uimage=uImage-nhk15 diff --git a/arch/arm/boards/nhk8815/setup.c b/arch/arm/boards/nhk8815/setup.c index e9295f651e..9cb0fd0494 100644 --- a/arch/arm/boards/nhk8815/setup.c +++ b/arch/arm/boards/nhk8815/setup.c @@ -25,7 +25,7 @@ #include <partition.h> #include <nand.h> #include <asm/armlinux.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <asm/io.h> #include <mach/hardware.h> @@ -34,6 +34,7 @@ #include <mach/fsmc.h> static struct device_d nhk8815_network_dev = { + .id = -1, .name = "smc91c111", .map_base = 0x34000300, .size = 16, @@ -62,6 +63,7 @@ static struct nomadik_nand_platform_data nhk8815_nand_data = { }; static struct device_d nhk8815_nand_device = { + .id = -1, .name = "nomadik_nand", .platform_data = &nhk8815_nand_data, }; diff --git a/arch/arm/boards/omap/board-beagle.c b/arch/arm/boards/omap/board-beagle.c index e9d3072262..6de2cce7d9 100644 --- a/arch/arm/boards/omap/board-beagle.c +++ b/arch/arm/boards/omap/board-beagle.c @@ -59,7 +59,7 @@ #include <asm/io.h> #include <ns16550.h> #include <asm/armlinux.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <mach/silicon.h> #include <mach/sdrc.h> #include <mach/sys_info.h> @@ -241,6 +241,7 @@ static struct NS16550_plat serial_plat = { }; static struct device_d beagle_serial_device = { + .id = -1, .name = "serial_ns16550", .map_base = OMAP_UART3_BASE, .size = 1024, @@ -267,6 +268,7 @@ static struct memory_platform_data sram_pdata = { }; static struct device_d sdram_dev = { + .id = -1, .name = "mem", .map_base = 0x80000000, .size = 128 * 1024 * 1024, @@ -291,6 +293,7 @@ static struct ehci_platform_data ehci_pdata = { }; static struct device_d usbh_dev = { + .id = -1, .name = "ehci", .map_base = 0x48064700, .size = 4 * 1024, @@ -299,6 +302,7 @@ static struct device_d usbh_dev = { #endif /* CONFIG_USB_EHCI_OMAP */ static struct device_d i2c_dev = { + .id = -1, .name = "i2c-omap", .map_base = OMAP_I2C1_BASE, }; diff --git a/arch/arm/boards/omap/board-omap3evm.c b/arch/arm/boards/omap/board-omap3evm.c index 619ea94485..c37f1519ff 100644 --- a/arch/arm/boards/omap/board-omap3evm.c +++ b/arch/arm/boards/omap/board-omap3evm.c @@ -218,6 +218,7 @@ static struct NS16550_plat serial_plat = { }; static struct device_d omap3evm_serial_device = { + .id = -1, .name = "serial_ns16550", #if defined(CONFIG_OMAP3EVM_UART1) .map_base = OMAP_UART1_BASE, @@ -246,6 +247,7 @@ static struct memory_platform_data sram_pdata = { }; static struct device_d sdram_dev = { + .id = -1, .name = "mem", .map_base = 0x80000000, .size = 128 * 1024 * 1024, diff --git a/arch/arm/boards/omap/board-sdp343x.c b/arch/arm/boards/omap/board-sdp343x.c index 32d1a4235c..f7615b4673 100644 --- a/arch/arm/boards/omap/board-sdp343x.c +++ b/arch/arm/boards/omap/board-sdp343x.c @@ -610,6 +610,7 @@ static struct NS16550_plat serial_plat = { }; static struct device_d sdp3430_serial_device = { + .id = -1, .name = "serial_ns16550", .map_base = OMAP_UART3_BASE, .size = 1024, @@ -646,6 +647,7 @@ static struct memory_platform_data ram_pdata = { }; struct device_d sdram_dev = { + .id = -1, .name = "mem", .map_base = 0x80000000, .size = 128 * 1024 * 1024, diff --git a/arch/arm/boards/omap/devices-gpmc-nand.c b/arch/arm/boards/omap/devices-gpmc-nand.c index ac23e9d036..4369aa0029 100644 --- a/arch/arm/boards/omap/devices-gpmc-nand.c +++ b/arch/arm/boards/omap/devices-gpmc-nand.c @@ -72,6 +72,7 @@ static struct gpmc_nand_platform_data nand_plat = { /** NAND device definition */ static struct device_d gpmc_generic_nand_nand_device = { + .id = -1, .name = "gpmc_nand", .map_base = OMAP_GPMC_BASE, .size = 1024 * 4, /* GPMC size */ diff --git a/arch/arm/boards/pcm037/pcm037.c b/arch/arm/boards/pcm037/pcm037.c index 2e6968b844..89e248190a 100644 --- a/arch/arm/boards/pcm037/pcm037.c +++ b/arch/arm/boards/pcm037/pcm037.c @@ -35,7 +35,7 @@ #include <asm/io.h> #include <asm/mmu.h> #include <partition.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <mach/imx-nand.h> @@ -44,6 +44,7 @@ * CS line 0, data width is 16 bit */ static struct device_d cfi_dev = { + .id = -1, .name = "cfi_flash", .map_base = IMX_CS0_BASE, .size = 32 * 1024 * 1024, /* area size */ @@ -59,6 +60,7 @@ static struct memory_platform_data sram_dev_pdata0 = { }; static struct device_d sram_dev = { + .id = -1, .name = "mem", .map_base = IMX_CS4_BASE, .size = IMX_CS4_RANGE, /* area size */ @@ -71,6 +73,7 @@ static struct device_d sram_dev = { * GPIO3, data width is 16 bit */ static struct device_d network_dev = { + .id = -1, .name = "smc911x", .map_base = IMX_CS1_BASE, .size = IMX_CS1_RANGE, /* area size */ @@ -88,6 +91,7 @@ static struct memory_platform_data ram_dev_pdata0 = { }; static struct device_d sdram0_dev = { + .id = -1, .name = "mem", .map_base = IMX_SDRAM_CS0, .size = SDRAM0 * 1024 * 1024, /* fix size */ @@ -108,6 +112,7 @@ static struct memory_platform_data ram_dev_pdata1 = { }; static struct device_d sdram1_dev = { + .id = -1, .name = "mem", .map_base = IMX_SDRAM_CS1, .size = SDRAM1 * 1024 * 1024, /* fix size */ @@ -122,6 +127,7 @@ struct imx_nand_platform_data nand_info = { }; static struct device_d nand_dev = { + .id = -1, .name = "imx_nand", .map_base = 0xB8000000, .platform_data = &nand_info, @@ -129,12 +135,14 @@ static struct device_d nand_dev = { #ifdef CONFIG_USB static struct device_d usbotg_dev = { + .id = -1, .name = "ehci", .map_base = IMX_OTG_BASE, .size = 0x200, }; static struct device_d usbh2_dev = { + .id = -1, .name = "ehci", .map_base = IMX_OTG_BASE + 0x400, .size = 0x200, @@ -313,6 +321,7 @@ static int imx31_devices_init(void) device_initcall(imx31_devices_init); static struct device_d imx31_serial_device = { + .id = -1, .name = "imx_serial", .map_base = IMX_UART1_BASE, .size = 16 * 1024, diff --git a/arch/arm/boards/pcm038/lowlevel.c b/arch/arm/boards/pcm038/lowlevel.c index d366d440af..eb85e8f27b 100644 --- a/arch/arm/boards/pcm038/lowlevel.c +++ b/arch/arm/boards/pcm038/lowlevel.c @@ -25,7 +25,6 @@ #include <mach/imx-regs.h> #include <mach/imx-pll.h> #include <mach/esdctl.h> -#include <asm/cache-l2x0.h> #include <asm/io.h> #include <mach/imx-nand.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/pcm038/pcm038.c b/arch/arm/boards/pcm038/pcm038.c index 03794fc13d..fda326240b 100644 --- a/arch/arm/boards/pcm038/pcm038.c +++ b/arch/arm/boards/pcm038/pcm038.c @@ -27,7 +27,7 @@ #include <notifier.h> #include <mach/gpio.h> #include <asm/armlinux.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <mach/pmic.h> #include <partition.h> #include <fs.h> @@ -45,6 +45,7 @@ #include <mach/iomux-mx27.h> static struct device_d cfi_dev = { + .id = -1, .name = "cfi_flash", .map_base = 0xC0000000, .size = 32 * 1024 * 1024, @@ -56,6 +57,7 @@ static struct memory_platform_data ram_pdata = { }; static struct device_d sdram_dev = { + .id = -1, .name = "mem", .map_base = 0xa0000000, .size = 128 * 1024 * 1024, @@ -68,6 +70,7 @@ static struct memory_platform_data sram_pdata = { }; static struct device_d sram_dev = { + .id = -1, .name = "mem", .map_base = 0xc8000000, .size = 512 * 1024, /* Can be up to 2MiB */ @@ -80,6 +83,7 @@ static struct fec_platform_data fec_info = { }; static struct device_d fec_dev = { + .id = -1, .name = "fec_imx", .map_base = 0x1002b000, .platform_data = &fec_info, @@ -93,6 +97,7 @@ static struct spi_imx_master pcm038_spi_0_data = { }; static struct device_d spi_dev = { + .id = -1, .name = "imx_spi", .map_base = 0x1000e000, .platform_data = &pcm038_spi_0_data, @@ -114,6 +119,7 @@ static struct imx_nand_platform_data nand_info = { }; static struct device_d nand_dev = { + .id = -1, .name = "imx_nand", .map_base = 0xd8000000, .platform_data = &nand_info, @@ -154,6 +160,7 @@ static struct imx_fb_platform_data pcm038_fb_data = { }; static struct device_d imxfb_dev = { + .id = -1, .name = "imxfb", .map_base = 0x10021000, .size = 0x1000, @@ -162,6 +169,7 @@ static struct device_d imxfb_dev = { #ifdef CONFIG_USB static struct device_d usbh2_dev = { + .id = -1, .name = "ehci", .map_base = IMX_OTG_BASE + 0x400, .size = 0x200, @@ -363,6 +371,7 @@ static int pcm038_devices_init(void) device_initcall(pcm038_devices_init); static struct device_d pcm038_serial_device = { + .id = -1, .name = "imx_serial", .map_base = IMX_UART1_BASE, .size = 4096, @@ -387,7 +396,7 @@ extern void *pcm038_pll_init, *pcm038_pll_init_end; static int pcm038_power_init(void) { int ret; - void *vram = 0xffff4c00; + void *vram = (void*)0xffff4c00; void (*pllfunc)(void) = vram; printf("initialising PLLs: 0x%p 0x%p\n", &pcm038_pll_init); diff --git a/arch/arm/boards/pcm043/pcm043.c b/arch/arm/boards/pcm043/pcm043.c index 497149d1d8..9f98795fd1 100644 --- a/arch/arm/boards/pcm043/pcm043.c +++ b/arch/arm/boards/pcm043/pcm043.c @@ -35,7 +35,7 @@ #include <asm/io.h> #include <partition.h> #include <nand.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <mach/imx-nand.h> #include <fec.h> #include <fb.h> @@ -49,6 +49,7 @@ * CS line 0, data width is 16 bit */ static struct device_d cfi_dev = { + .id = -1, .name = "cfi_flash", .map_base = IMX_CS0_BASE, .size = 32 * 1024 * 1024, /* area size */ @@ -59,6 +60,7 @@ static struct fec_platform_data fec_info = { }; static struct device_d fec_dev = { + .id = -1, .name = "fec_imx", .map_base = IMX_FEC_BASE, .platform_data = &fec_info, @@ -70,6 +72,7 @@ static struct memory_platform_data ram_pdata = { }; static struct device_d sdram0_dev = { + .id = -1, .name = "mem", .map_base = IMX_SDRAM_CS0, .size = 128 * 1024 * 1024, @@ -83,6 +86,7 @@ struct imx_nand_platform_data nand_info = { }; static struct device_d nand_dev = { + .id = -1, .name = "imx_nand", .map_base = IMX_NFC_BASE, .platform_data = &nand_info, @@ -132,6 +136,7 @@ static struct imx_ipu_fb_platform_data ipu_fb_data = { }; static struct device_d imx_ipu_fb_dev = { + .id = -1, .name = "imx-ipu-fb", .map_base = 0x53fc0000, .size = 0x1000, @@ -217,6 +222,7 @@ static int imx35_devices_init(void) device_initcall(imx35_devices_init); static struct device_d imx35_serial_device = { + .id = -1, .name = "imx_serial", .map_base = IMX_UART1_BASE, .size = 16 * 1024, diff --git a/arch/arm/boards/phycard-i.MX27/pca100.c b/arch/arm/boards/phycard-i.MX27/pca100.c index ce59960e22..7328a6c894 100644 --- a/arch/arm/boards/phycard-i.MX27/pca100.c +++ b/arch/arm/boards/phycard-i.MX27/pca100.c @@ -26,7 +26,7 @@ #include <fec.h> #include <mach/gpio.h> #include <asm/armlinux.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <partition.h> #include <fs.h> #include <fcntl.h> @@ -46,6 +46,7 @@ static struct memory_platform_data ram_pdata = { }; static struct device_d sdram_dev = { + .id = -1, .name = "mem", .map_base = 0xa0000000, .size = 128 * 1024 * 1024, @@ -58,6 +59,7 @@ static struct fec_platform_data fec_info = { }; static struct device_d fec_dev = { + .id = -1, .name = "fec_imx", .map_base = 0x1002b000, .platform_data = &fec_info, @@ -69,6 +71,7 @@ struct imx_nand_platform_data nand_info = { }; static struct device_d nand_dev = { + .id = -1, .name = "imx_nand", .map_base = 0xd8000000, .platform_data = &nand_info, @@ -76,6 +79,7 @@ static struct device_d nand_dev = { #ifdef CONFIG_USB static struct device_d usbh2_dev = { + .id = -1, .name = "ehci", .map_base = IMX_OTG_BASE + 0x400, .size = 0x200, @@ -216,6 +220,7 @@ static int pca100_devices_init(void) device_initcall(pca100_devices_init); static struct device_d pca100_serial_device = { + .id = -1, .name = "imx_serial", .map_base = IMX_UART1_BASE, .size = 4096, diff --git a/arch/arm/boards/pm9263/init.c b/arch/arm/boards/pm9263/init.c index d5ed921ff6..abe8def13c 100644 --- a/arch/arm/boards/pm9263/init.c +++ b/arch/arm/boards/pm9263/init.c @@ -24,7 +24,7 @@ #include <environment.h> #include <fec.h> #include <asm/armlinux.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <partition.h> #include <fs.h> #include <fcntl.h> @@ -87,6 +87,7 @@ static void pm_add_device_nand(void) } static struct device_d cfi_dev = { + .id = -1, .name = "cfi_flash", .map_base = AT91_CHIPSELECT_0, .size = 4 * 1024 * 1024, diff --git a/arch/arm/boards/scb9328/scb9328.c b/arch/arm/boards/scb9328/scb9328.c index c828e10583..4c08c504c5 100644 --- a/arch/arm/boards/scb9328/scb9328.c +++ b/arch/arm/boards/scb9328/scb9328.c @@ -22,7 +22,7 @@ #include <net.h> #include <init.h> #include <environment.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <mach/imx-regs.h> #include <asm/armlinux.h> #include <mach/gpio.h> @@ -33,6 +33,7 @@ #include <dm9000.h> static struct device_d cfi_dev = { + .id = -1, .name = "cfi_flash", .map_base = 0x10000000, @@ -45,6 +46,7 @@ static struct memory_platform_data sdram_pdata = { }; static struct device_d sdram_dev = { + .id = -1, .name = "mem", .map_base = 0x08000000, .size = 16 * 1024 * 1024, @@ -59,6 +61,7 @@ static struct dm9000_platform_data dm9000_data = { }; static struct device_d dm9000_dev = { + .id = -1, .name = "dm9000", .map_base = 0x16000000, .size = 8, @@ -104,6 +107,7 @@ static int scb9328_devices_init(void) { device_initcall(scb9328_devices_init); static struct device_d scb9328_serial_device = { + .id = -1, .name = "imx_serial", .map_base = IMX_UART1_BASE, .size = 4096, diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig deleted file mode 100644 index e749e45d1f..0000000000 --- a/arch/arm/common/Kconfig +++ /dev/null @@ -1,2 +0,0 @@ -config COMMON_CLKDEV - bool diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile deleted file mode 100644 index 9cc8834626..0000000000 --- a/arch/arm/common/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# -# Makefile for the linux kernel. -# - -obj-$(CONFIG_COMMON_CLKDEV) += clkdev.o diff --git a/arch/arm/common/clkdev.c b/arch/arm/common/clkdev.c deleted file mode 100644 index 4d253569ee..0000000000 --- a/arch/arm/common/clkdev.c +++ /dev/null @@ -1,160 +0,0 @@ -/* - * arch/arm/common/clkdev.c - * - * Copyright (C) 2008 Russell King. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * Helper for the clk API to assist looking up a struct clk. - */ - -#include <common.h> -#include <linux/list.h> -#include <errno.h> -#include <linux/err.h> -#include <linux/clk.h> -#include <init.h> -#include <malloc.h> -#include <stdio.h> - -#include <asm/clkdev.h> -#include <mach/clkdev.h> - -static LIST_HEAD(clocks); - -/* - * Find the correct struct clk for the device and connection ID. - * We do slightly fuzzy matching here: - * An entry with a NULL ID is assumed to be a wildcard. - * If an entry has a device ID, it must match - * If an entry has a connection ID, it must match - * Then we take the most specific entry - with the following - * order of precidence: dev+con > dev only > con only. - */ -static struct clk *clk_find(const char *dev_id, const char *con_id) -{ - struct clk_lookup *p; - struct clk *clk = NULL; - int match, best = 0; - - list_for_each_entry(p, &clocks, node) { - match = 0; - if (p->dev_id) { - if (!dev_id || strcmp(p->dev_id, dev_id)) - continue; - match += 2; - } - if (p->con_id) { - if (!con_id || strcmp(p->con_id, con_id)) - continue; - match += 1; - } - if (match == 0) - continue; - - if (match > best) { - clk = p->clk; - best = match; - } - } - return clk; -} - -struct clk *clk_get_sys(const char *dev_id, const char *con_id) -{ - struct clk *clk; - - clk = clk_find(dev_id, con_id); - if (clk && !__clk_get(clk)) - clk = NULL; - - return clk ? clk : ERR_PTR(-ENOENT); -} -EXPORT_SYMBOL(clk_get_sys); - -struct clk *clk_get(struct device_d *dev, const char *con_id) -{ - const char *dev_id = dev ? dev_name(dev) : NULL; - - return clk_get_sys(dev_id, con_id); -} -EXPORT_SYMBOL(clk_get); - -void clk_put(struct clk *clk) -{ - __clk_put(clk); -} -EXPORT_SYMBOL(clk_put); - -void clkdev_add(struct clk_lookup *cl) -{ - list_add_tail(&cl->node, &clocks); -} -EXPORT_SYMBOL(clkdev_add); - -#define MAX_DEV_ID 20 -#define MAX_CON_ID 16 - -struct clk_lookup_alloc { - struct clk_lookup cl; - char dev_id[MAX_DEV_ID]; - char con_id[MAX_CON_ID]; -}; - -struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id, - const char *dev_fmt, ...) -{ - struct clk_lookup_alloc *cla; - - cla = kzalloc(sizeof(*cla), GFP_KERNEL); - if (!cla) - return NULL; - - cla->cl.clk = clk; - if (con_id) { - strlcpy(cla->con_id, con_id, sizeof(cla->con_id)); - cla->cl.con_id = cla->con_id; - } - - if (dev_fmt) { - va_list ap; - - va_start(ap, dev_fmt); - vscnprintf(cla->dev_id, sizeof(cla->dev_id), dev_fmt, ap); - cla->cl.dev_id = cla->dev_id; - va_end(ap); - } - - return &cla->cl; -} -EXPORT_SYMBOL(clkdev_alloc); - -int clk_add_alias(const char *alias, const char *alias_dev_name, char *id, - struct device_d *dev) -{ - struct clk *r = clk_get(dev, id); - struct clk_lookup *l; - - if (IS_ERR(r)) - return PTR_ERR(r); - - l = clkdev_alloc(r, alias, alias_dev_name); - clk_put(r); - if (!l) - return -ENODEV; - clkdev_add(l); - return 0; -} -EXPORT_SYMBOL(clk_add_alias); - -/* - * clkdev_drop - remove a clock dynamically allocated - */ -void clkdev_drop(struct clk_lookup *cl) -{ - list_del(&cl->node); - kfree(cl); -} -EXPORT_SYMBOL(clkdev_drop); diff --git a/arch/arm/configs/a9m2410_defconfig b/arch/arm/configs/a9m2410_defconfig index e9fa74c456..57e73c7f44 100644 --- a/arch/arm/configs/a9m2410_defconfig +++ b/arch/arm/configs/a9m2410_defconfig @@ -1,122 +1,16 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2.0.0-rc10 -# Fri Dec 18 11:46:05 2009 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_AT91RM9200 is not set -# CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_OMAP is not set CONFIG_ARCH_S3C24xx=y - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_ARM920T=y -CONFIG_CPU_32v4T=y - -# -# processor features -# -CONFIG_ARCH_TEXT_BASE=0x31fc0000 -CONFIG_BOARDINFO="Digi A9M2410" -CONFIG_CPU_S3C2410=y -CONFIG_MACH_A9M2410=y -# CONFIG_MACH_A9M2440 is not set - -# -# Board specific settings -# - -# -# S3C24X0 Features -# -CONFIG_S3C24XX_LOW_LEVEL_INIT=y -CONFIG_S3C24XX_PLL_INIT=y -CONFIG_S3C24XX_SDRAM_INIT=y CONFIG_S3C24XX_NAND_BOOT=y -# CONFIG_AEABI is not set - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y -CONFIG_CMDLINE_TAG=y -CONFIG_SETUP_MEMORY_TAGS=y -# CONFIG_INITRD_TAG is not set CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y -CONFIG_TEXT_BASE=0x31fc0000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 -CONFIG_MALLOC_SIZE=0x400000 CONFIG_BROKEN=y CONFIG_EXPERIMENTAL=y -# CONFIG_MODULES is not set -# CONFIG_KALLSYMS is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="barebox:" CONFIG_BAUDRATE=38400 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set CONFIG_GLOB=y -CONFIG_PROMPT_HUSH_PS2="> " CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/a9m2410/env" - -# -# Debugging -# CONFIG_DEBUG_INFO=y -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -124,114 +18,17 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y - -# -# memory -# -# CONFIG_CMD_LOADB is not set -# CONFIG_CMD_LOADY is not set -# CONFIG_CMD_LOADS is not set CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y CONFIG_CMD_MTEST=y -# CONFIG_CMD_MTEST_ALTERNATIVE is not set - -# -# flash -# CONFIG_CMD_FLASH=y - -# -# booting -# -CONFIG_CMD_BOOTM=y -# CONFIG_CMD_BOOTM_ZLIB is not set -# CONFIG_CMD_BOOTM_BZLIB is not set -# CONFIG_CMD_BOOTM_SHOW_TYPE is not set -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_NET=y CONFIG_NET_DHCP=y -# CONFIG_NET_RARP is not set -# CONFIG_NET_NFS is not set CONFIG_NET_PING=y CONFIG_NET_TFTP=y - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set -# CONFIG_DRIVER_SERIAL_NS16550 is not set -CONFIG_DRIVER_SERIAL_S3C24X0=y -# CONFIG_DRIVER_SERIAL_S3C24X0_AUTOSYNC is not set -CONFIG_MIIDEV=y - -# -# Network drivers -# -# CONFIG_DRIVER_NET_SMC911X is not set CONFIG_DRIVER_NET_SMC91111=y - -# -# SPI drivers -# # CONFIG_SPI is not set -# CONFIG_I2C is not set - -# -# flash drivers -# -# CONFIG_DRIVER_CFI is not set -# CONFIG_DRIVER_CFI_OLD is not set -CONFIG_NAND=y -CONFIG_NAND_S3C24X0=y -# CONFIG_MTD_NAND_VERIFY_WRITE is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=y -# CONFIG_MTD_NAND_DISKONCHIP is not set -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set diff --git a/arch/arm/configs/a9m2440_defconfig b/arch/arm/configs/a9m2440_defconfig index b7a26bc0d0..ae7f5238c3 100644 --- a/arch/arm/configs/a9m2440_defconfig +++ b/arch/arm/configs/a9m2440_defconfig @@ -1,123 +1,18 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2.0.0-rc10 -# Fri Dec 18 11:46:15 2009 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_AT91RM9200 is not set -# CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_OMAP is not set CONFIG_ARCH_S3C24xx=y - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_ARM920T=y -CONFIG_CPU_32v4T=y - -# -# processor features -# -CONFIG_ARCH_TEXT_BASE=0x31fc0000 -CONFIG_BOARDINFO="Digi A9M2440" -CONFIG_CPU_S3C2440=y -# CONFIG_MACH_A9M2410 is not set CONFIG_MACH_A9M2440=y - -# -# Board specific settings -# -CONFIG_MACH_A9M2410DEV=y - -# -# S3C24X0 Features -# -CONFIG_S3C24XX_LOW_LEVEL_INIT=y -CONFIG_S3C24XX_PLL_INIT=y CONFIG_S3C24XX_SDRAM_INIT=y CONFIG_S3C24XX_NAND_BOOT=y -# CONFIG_AEABI is not set - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y -CONFIG_CMDLINE_TAG=y -CONFIG_SETUP_MEMORY_TAGS=y -# CONFIG_INITRD_TAG is not set CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y -CONFIG_TEXT_BASE=0x31fc0000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 -CONFIG_MALLOC_SIZE=0x400000 CONFIG_BROKEN=y CONFIG_EXPERIMENTAL=y -# CONFIG_MODULES is not set -# CONFIG_KALLSYMS is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="barebox:" CONFIG_BAUDRATE=38400 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set CONFIG_GLOB=y -CONFIG_PROMPT_HUSH_PS2="> " CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/a9m2440/env" - -# -# Debugging -# CONFIG_DEBUG_INFO=y -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -125,116 +20,17 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y - -# -# memory -# -# CONFIG_CMD_LOADB is not set -# CONFIG_CMD_LOADY is not set -# CONFIG_CMD_LOADS is not set CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y CONFIG_CMD_MTEST=y -# CONFIG_CMD_MTEST_ALTERNATIVE is not set - -# -# flash -# CONFIG_CMD_FLASH=y - -# -# booting -# -CONFIG_CMD_BOOTM=y -# CONFIG_CMD_BOOTM_ZLIB is not set -# CONFIG_CMD_BOOTM_BZLIB is not set -# CONFIG_CMD_BOOTM_SHOW_TYPE is not set -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_NET=y CONFIG_NET_DHCP=y -# CONFIG_NET_RARP is not set -# CONFIG_NET_NFS is not set CONFIG_NET_PING=y CONFIG_NET_TFTP=y - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set -# CONFIG_DRIVER_SERIAL_NS16550 is not set -CONFIG_DRIVER_SERIAL_S3C24X0=y -# CONFIG_DRIVER_SERIAL_S3C24X0_AUTOSYNC is not set -CONFIG_HAS_CS8900=y -CONFIG_MIIDEV=y - -# -# Network drivers -# -# CONFIG_DRIVER_NET_CS8900 is not set -# CONFIG_DRIVER_NET_SMC911X is not set CONFIG_DRIVER_NET_SMC91111=y - -# -# SPI drivers -# # CONFIG_SPI is not set -# CONFIG_I2C is not set - -# -# flash drivers -# -# CONFIG_DRIVER_CFI is not set -# CONFIG_DRIVER_CFI_OLD is not set -CONFIG_NAND=y -CONFIG_NAND_S3C24X0=y -# CONFIG_MTD_NAND_VERIFY_WRITE is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=y -# CONFIG_MTD_NAND_DISKONCHIP is not set -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set diff --git a/arch/arm/configs/at91sam9260ek_defconfig b/arch/arm/configs/at91sam9260ek_defconfig index 0387b713db..6038aec3fe 100644 --- a/arch/arm/configs/at91sam9260ek_defconfig +++ b/arch/arm/configs/at91sam9260ek_defconfig @@ -1,111 +1,10 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2.0.0-rc10 -# Fri Dec 18 11:46:40 2009 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -CONFIG_ARCH_AT91=y -# CONFIG_ARCH_AT91RM9200 is not set -# CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_S3C24xx is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_ARM926T=y -CONFIG_CPU_32v5=y - -# -# processor features -# -CONFIG_ARCH_TEXT_BASE=0x23f00000 -CONFIG_BOARDINFO="Atmel 91SAM9260-EK" - -# -# Atmel AT91 System-on-Chip -# -CONFIG_ARCH_AT91SAM9260=y -# CONFIG_ARCH_AT91SAM9263 is not set -CONFIG_MACH_AT91SAM9260EK=y -# CONFIG_AEABI is not set - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y -CONFIG_CMDLINE_TAG=y -CONFIG_SETUP_MEMORY_TAGS=y -# CONFIG_INITRD_TAG is not set CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y -CONFIG_GENERIC_GPIO=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y -CONFIG_TEXT_BASE=0x23f00000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 -CONFIG_MALLOC_SIZE=0x400000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_PROMPT="barebox:" -CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set CONFIG_GLOB=y -CONFIG_PROMPT_HUSH_PS2="> " CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/at91sam9260ek/env" - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -113,112 +12,18 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y - -# -# memory -# -# CONFIG_CMD_LOADB is not set CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y CONFIG_CMD_MTEST=y -# CONFIG_CMD_MTEST_ALTERNATIVE is not set - -# -# flash -# CONFIG_CMD_FLASH=y - -# -# booting -# -CONFIG_CMD_BOOTM=y -# CONFIG_CMD_BOOTM_ZLIB is not set -# CONFIG_CMD_BOOTM_BZLIB is not set -# CONFIG_CMD_BOOTM_SHOW_TYPE is not set -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_CMD_GPIO=y CONFIG_NET=y CONFIG_NET_DHCP=y -# CONFIG_NET_RARP is not set -# CONFIG_NET_NFS is not set CONFIG_NET_PING=y CONFIG_NET_TFTP=y - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set -# CONFIG_DRIVER_SERIAL_NS16550 is not set -CONFIG_DRIVER_SERIAL_ATMEL=y -CONFIG_MIIDEV=y - -# -# Network drivers -# -# CONFIG_DRIVER_NET_SMC911X is not set -# CONFIG_DRIVER_NET_SMC91111 is not set CONFIG_DRIVER_NET_MACB=y - -# -# SPI drivers -# # CONFIG_SPI is not set -# CONFIG_I2C is not set - -# -# flash drivers -# -# CONFIG_DRIVER_CFI is not set -# CONFIG_DRIVER_CFI_OLD is not set -CONFIG_NAND=y -CONFIG_NAND_ATMEL=y -# CONFIG_MTD_NAND_VERIFY_WRITE is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=y -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set diff --git a/arch/arm/configs/at91sam9263ek_defconfig b/arch/arm/configs/at91sam9263ek_defconfig index ae4006c47c..c92999f8c7 100644 --- a/arch/arm/configs/at91sam9263ek_defconfig +++ b/arch/arm/configs/at91sam9263ek_defconfig @@ -1,115 +1,12 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2.0.0-rc10 -# Fri Dec 18 11:47:16 2009 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -CONFIG_ARCH_AT91=y -# CONFIG_ARCH_AT91RM9200 is not set -# CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_S3C24xx is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_ARM926T=y -CONFIG_CPU_32v5=y - -# -# processor features -# -CONFIG_ARCH_TEXT_BASE=0x23f00000 -CONFIG_BOARDINFO="Atmel at91sam9263-ek" - -# -# Atmel AT91 System-on-Chip -# -# CONFIG_ARCH_AT91SAM9260 is not set CONFIG_ARCH_AT91SAM9263=y -CONFIG_MACH_AT91SAM9263EK=y -# CONFIG_MACH_MMCCPU is not set -# CONFIG_MACH_PM9263 is not set -# CONFIG_AEABI is not set - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y -CONFIG_CMDLINE_TAG=y -CONFIG_SETUP_MEMORY_TAGS=y -# CONFIG_INITRD_TAG is not set CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y -CONFIG_GENERIC_GPIO=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y -CONFIG_TEXT_BASE=0x23f00000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 -CONFIG_MALLOC_SIZE=0x400000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y CONFIG_PROMPT="9263-EK:" -CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set CONFIG_GLOB=y -CONFIG_PROMPT_HUSH_PS2="> " CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/at91sam9263ek/env" - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -117,121 +14,24 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y - -# -# memory -# -# CONFIG_CMD_LOADB is not set CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y CONFIG_CMD_MTEST=y -# CONFIG_CMD_MTEST_ALTERNATIVE is not set - -# -# flash -# CONFIG_CMD_FLASH=y - -# -# booting -# -CONFIG_CMD_BOOTM=y CONFIG_CMD_BOOTM_ZLIB=y CONFIG_CMD_BOOTM_BZLIB=y CONFIG_CMD_BOOTM_SHOW_TYPE=y -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_CMD_GPIO=y CONFIG_NET=y CONFIG_NET_DHCP=y -# CONFIG_NET_RARP is not set CONFIG_NET_NFS=y CONFIG_NET_PING=y CONFIG_NET_TFTP=y - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set -# CONFIG_DRIVER_SERIAL_NS16550 is not set -CONFIG_DRIVER_SERIAL_ATMEL=y -CONFIG_MIIDEV=y - -# -# Network drivers -# -# CONFIG_DRIVER_NET_SMC911X is not set -# CONFIG_DRIVER_NET_SMC91111 is not set CONFIG_DRIVER_NET_MACB=y - -# -# SPI drivers -# # CONFIG_SPI is not set -# CONFIG_I2C is not set - -# -# flash drivers -# CONFIG_DRIVER_CFI=y -CONFIG_DRIVER_CFI_NEW=y -CONFIG_DRIVER_CFI_INTEL=y -CONFIG_DRIVER_CFI_AMD=y -CONFIG_DRIVER_CFI_BANK_WIDTH_1=y -CONFIG_DRIVER_CFI_BANK_WIDTH_2=y -CONFIG_DRIVER_CFI_BANK_WIDTH_4=y -# CONFIG_DRIVER_CFI_BANK_WIDTH_8 is not set CONFIG_CFI_BUFFER_WRITE=y -CONFIG_NAND=y -CONFIG_NAND_ATMEL=y -# CONFIG_MTD_NAND_VERIFY_WRITE is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=y -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_ZLIB=y -CONFIG_BZLIB=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set diff --git a/arch/arm/configs/at91sam9g20ek_defconfig b/arch/arm/configs/at91sam9g20ek_defconfig new file mode 100644 index 0000000000..bc7c242969 --- /dev/null +++ b/arch/arm/configs/at91sam9g20ek_defconfig @@ -0,0 +1,39 @@ +CONFIG_ARCH_AT91SAM9G20=y +CONFIG_MACH_AT91SAM9G20EK=y +CONFIG_AT91_HAVE_2MMC=y +CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y +CONFIG_PROMPT="9G20-EK:" +CONFIG_LONGHELP=y +CONFIG_GLOB=y +CONFIG_PROMPT_HUSH_PS2="y" +CONFIG_CMDLINE_EDITING=y +CONFIG_AUTO_COMPLETE=y +CONFIG_PARTITION=y +CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/at91sam9260ek/env" +CONFIG_CMD_EDIT=y +CONFIG_CMD_SLEEP=y +CONFIG_CMD_SAVEENV=y +CONFIG_CMD_LOADENV=y +CONFIG_CMD_EXPORT=y +CONFIG_CMD_PRINTENV=y +CONFIG_CMD_READLINE=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_CRC=y +CONFIG_CMD_MTEST=y +CONFIG_CMD_MTEST_ALTERNATIVE=y +CONFIG_CMD_FLASH=y +CONFIG_CMD_BOOTM_SHOW_TYPE=y +CONFIG_CMD_RESET=y +CONFIG_CMD_GO=y +CONFIG_CMD_TIMEOUT=y +CONFIG_CMD_PARTITION=y +CONFIG_CMD_GPIO=y +CONFIG_NET=y +CONFIG_NET_DHCP=y +CONFIG_NET_PING=y +CONFIG_NET_TFTP=y +CONFIG_DRIVER_NET_MACB=y +# CONFIG_SPI is not set +CONFIG_I2C=y +CONFIG_DRIVER_CFI=y +CONFIG_CFI_BUFFER_WRITE=y diff --git a/arch/arm/configs/edb93xx_defconfig b/arch/arm/configs/edb93xx_defconfig index 936bd4725c..3b663844e6 100644 --- a/arch/arm/configs/edb93xx_defconfig +++ b/arch/arm/configs/edb93xx_defconfig @@ -1,125 +1,12 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2009.12.0 -# Fri Jan 8 17:27:15 2010 -# -CONFIG_ARM=y - -# -# System Type -# -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_AT91RM9200 is not set CONFIG_ARCH_EP93XX=y -# CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_S3C24xx is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_ARM920T=y -CONFIG_CPU_32v4T=y - -# -# processor features -# -CONFIG_ARCH_TEXT_BASE=0x05700000 -CONFIG_BOARDINFO="Cirrus Logic EDB9301" -CONFIG_EP93XX_SDCE3_SYNC_PHYS_OFFSET=y - -# -# Cirrus EP93xx System-on-Chip -# -CONFIG_ARCH_EP9301=y -# CONFIG_ARCH_EP9302 is not set -# CONFIG_ARCH_EP9307 is not set -# CONFIG_ARCH_EP9312 is not set -# CONFIG_ARCH_EP9315 is not set -CONFIG_MACH_EDB9301=y -CONFIG_EP93XX_SDRAM_NUM_BANKS=4 -CONFIG_EP93XX_SDRAM_BANK0_BASE=0x00000000 -CONFIG_EP93XX_SDRAM_BANK0_SIZE=0x00800000 -CONFIG_EP93XX_SDRAM_BANK1_BASE=0x01000000 -CONFIG_EP93XX_SDRAM_BANK1_SIZE=0x00800000 -CONFIG_EP93XX_SDRAM_BANK2_BASE=0x04000000 -CONFIG_EP93XX_SDRAM_BANK2_SIZE=0x00800000 -CONFIG_EP93XX_SDRAM_BANK3_BASE=0x05000000 -CONFIG_EP93XX_SDRAM_BANK3_SIZE=0x00800000 CONFIG_AEABI=y - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y -CONFIG_CMDLINE_TAG=y -CONFIG_SETUP_MEMORY_TAGS=y -# CONFIG_INITRD_TAG is not set CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y -CONFIG_GENERIC_GPIO=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y -CONFIG_TEXT_BASE=0x05700000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 -CONFIG_MALLOC_SIZE=0x400000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="barebox:" -CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set CONFIG_GLOB=y -CONFIG_PROMPT_HUSH_PS2="> " CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/edb93xx/env" - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -127,110 +14,19 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y - -# -# memory -# -# CONFIG_CMD_LOADB is not set CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y CONFIG_CMD_MTEST=y -# CONFIG_CMD_MTEST_ALTERNATIVE is not set - -# -# flash -# CONFIG_CMD_FLASH=y - -# -# booting -# -CONFIG_CMD_BOOTM=y -# CONFIG_CMD_BOOTM_ZLIB is not set -# CONFIG_CMD_BOOTM_BZLIB is not set -# CONFIG_CMD_BOOTM_SHOW_TYPE is not set -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_CMD_GPIO=y CONFIG_NET=y CONFIG_NET_DHCP=y -# CONFIG_NET_RARP is not set -# CONFIG_NET_NFS is not set CONFIG_NET_PING=y CONFIG_NET_TFTP=y - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set -# CONFIG_DRIVER_SERIAL_NS16550 is not set -CONFIG_DRIVER_SERIAL_PL010=y -CONFIG_MIIDEV=y - -# -# Network drivers -# -# CONFIG_DRIVER_NET_SMC911X is not set -# CONFIG_DRIVER_NET_SMC91111 is not set CONFIG_DRIVER_NET_EP93XX=y - -# -# SPI drivers -# # CONFIG_SPI is not set -# CONFIG_I2C is not set - -# -# flash drivers -# CONFIG_DRIVER_CFI=y -# CONFIG_DRIVER_CFI_NEW is not set -CONFIG_DRIVER_CFI_OLD=y -# CONFIG_CFI_BUFFER_WRITE is not set -# CONFIG_NAND is not set -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set diff --git a/arch/arm/configs/eukrea_cpuimx25_defconfig b/arch/arm/configs/eukrea_cpuimx25_defconfig index abafc7222a..feb758e91d 100644 --- a/arch/arm/configs/eukrea_cpuimx25_defconfig +++ b/arch/arm/configs/eukrea_cpuimx25_defconfig @@ -1,130 +1,18 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2010.07.0 -# Thu Jul 29 09:54:50 2010 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_AT91RM9200 is not set -# CONFIG_ARCH_EP93XX is not set CONFIG_ARCH_IMX=y -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_S3C24xx is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_ARM926T=y -CONFIG_CPU_32v5=y - -# -# processor features -# -CONFIG_ARCH_TEXT_BASE=0x83f00000 -CONFIG_BOARDINFO="Eukrea CPUIMX25" -CONFIG_ARCH_HAS_FEC_IMX=y CONFIG_ARCH_IMX_INTERNAL_BOOT=y - -# -# Freescale i.MX System-on-Chip -# -# CONFIG_ARCH_IMX1 is not set -# CONFIG_ARCH_IMX21 is not set CONFIG_ARCH_IMX25=y -# CONFIG_ARCH_IMX27 is not set -# CONFIG_ARCH_IMX31 is not set -# CONFIG_ARCH_IMX35 is not set -CONFIG_MACH_EUKREA_CPUIMX25=y -# CONFIG_MACH_FREESCALE_MX25_3STACK is not set - -# -# Board specific settings -# - -# -# i.MX specific settings -# -# CONFIG_IMX_CLKO is not set -# CONFIG_AEABI is not set - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y -CONFIG_GENERIC_GPIO=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_MMU=y CONFIG_MMU=y -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y -CONFIG_TEXT_BASE=0x83f00000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 CONFIG_MALLOC_SIZE=0x1000000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y CONFIG_PROMPT="cpuimx25:" -CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set CONFIG_GLOB=y CONFIG_PROMPT_HUSH_PS2="cpuimx25>" CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/eukrea_cpuimx25/env" - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -132,128 +20,30 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y CONFIG_CMD_ECHO_E=y - -# -# memory -# -# CONFIG_CMD_LOADB is not set CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y CONFIG_CMD_MTEST=y -# CONFIG_CMD_MTEST_ALTERNATIVE is not set - -# -# flash -# CONFIG_CMD_FLASH=y -# CONFIG_CMD_UBI is not set - -# -# booting -# -CONFIG_CMD_BOOTM=y CONFIG_CMD_BOOTM_ZLIB=y CONFIG_CMD_BOOTM_BZLIB=y CONFIG_CMD_BOOTM_SHOW_TYPE=y -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y -# CONFIG_CMD_LINUX16 is not set CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_CMD_BMP=y CONFIG_CMD_GPIO=y CONFIG_CMD_UNLZO=y CONFIG_NET=y CONFIG_NET_DHCP=y -# CONFIG_NET_NFS is not set CONFIG_NET_PING=y CONFIG_NET_TFTP=y -# CONFIG_NET_TFTP_PUSH is not set -# CONFIG_NET_NETCONSOLE is not set -# CONFIG_NET_RESOLV is not set - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set -CONFIG_DRIVER_SERIAL_IMX=y -# CONFIG_DRIVER_SERIAL_NS16550 is not set -CONFIG_MIIDEV=y - -# -# Network drivers -# -# CONFIG_DRIVER_NET_SMC911X is not set -# CONFIG_DRIVER_NET_SMC91111 is not set CONFIG_DRIVER_NET_FEC_IMX=y - -# -# SPI drivers -# # CONFIG_SPI is not set -# CONFIG_I2C is not set - -# -# flash drivers -# -# CONFIG_DRIVER_CFI is not set CONFIG_MTD=y CONFIG_NAND=y CONFIG_NAND_IMX=y CONFIG_NAND_IMX_BOOT=y -# CONFIG_MTD_NAND_VERIFY_WRITE is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=y -# CONFIG_UBI is not set -# CONFIG_ATA is not set -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set CONFIG_VIDEO=y CONFIG_DRIVER_VIDEO_IMX=y -# CONFIG_IMXFB_DRIVER_VIDEO_IMX_OVERLAY is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_ZLIB=y -CONFIG_BZLIB=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set -CONFIG_PROCESS_ESCAPE_SEQUENCE=y -CONFIG_LZO_DECOMPRESS=y diff --git a/arch/arm/configs/eukrea_cpuimx27_defconfig b/arch/arm/configs/eukrea_cpuimx27_defconfig index 13df5677b0..75b849badf 100644 --- a/arch/arm/configs/eukrea_cpuimx27_defconfig +++ b/arch/arm/configs/eukrea_cpuimx27_defconfig @@ -1,140 +1,19 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2010.05.0 -# Tue May 25 09:57:55 2010 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_AT91RM9200 is not set -# CONFIG_ARCH_EP93XX is not set CONFIG_ARCH_IMX=y -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_S3C24xx is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_ARM926T=y -CONFIG_CPU_32v5=y - -# -# processor features -# -CONFIG_ARCH_TEXT_BASE=0xa0000000 -CONFIG_BOARDINFO="Eukrea CPUIMX27" -CONFIG_ARCH_HAS_FEC_IMX=y - -# -# Freescale i.MX System-on-Chip -# -# CONFIG_ARCH_IMX1 is not set -# CONFIG_ARCH_IMX21 is not set -# CONFIG_ARCH_IMX25 is not set CONFIG_ARCH_IMX27=y -# CONFIG_ARCH_IMX31 is not set -# CONFIG_ARCH_IMX35 is not set -CONFIG_MACH_EUKREA_CPUIMX27=y -# CONFIG_MACH_IMX27ADS is not set -# CONFIG_MACH_PCA100 is not set -# CONFIG_MACH_PCM038 is not set - -# -# Board specific settings -# -CONFIG_EUKREA_CPUIMX27_SDRAM_128MB=y -# CONFIG_EUKREA_CPUIMX27_SDRAM_256MB is not set -CONFIG_EUKREA_CPUIMX27_NOR_32MB=y -# CONFIG_EUKREA_CPUIMX27_NOR_64MB is not set -CONFIG_EUKREA_CPUIMX27_QUART1=y -# CONFIG_EUKREA_CPUIMX27_QUART2 is not set -# CONFIG_EUKREA_CPUIMX27_QUART3 is not set -# CONFIG_EUKREA_CPUIMX27_QUART4 is not set - -# -# i.MX specific settings -# CONFIG_IMX_CLKO=y -# CONFIG_AEABI is not set - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y -CONFIG_GENERIC_GPIO=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_MMU=y CONFIG_MMU=y -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y CONFIG_TEXT_BASE=0xa7f00000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 CONFIG_MALLOC_SIZE=0x800000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="barebox:" -CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set CONFIG_GLOB=y -CONFIG_PROMPT_HUSH_PS2="> " CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y # CONFIG_CONSOLE_ACTIVATE_FIRST is not set CONFIG_CONSOLE_ACTIVATE_ALL=y -# CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/eukrea_cpuimx27/env" - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -142,134 +21,34 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y CONFIG_CMD_ECHO_E=y - -# -# memory -# -# CONFIG_CMD_LOADB is not set CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y CONFIG_CMD_MTEST=y -# CONFIG_CMD_MTEST_ALTERNATIVE is not set - -# -# flash -# CONFIG_CMD_FLASH=y - -# -# booting -# -CONFIG_CMD_BOOTM=y -# CONFIG_CMD_BOOTM_ZLIB is not set -# CONFIG_CMD_BOOTM_BZLIB is not set CONFIG_CMD_BOOTM_SHOW_TYPE=y -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y -# CONFIG_CMD_LINUX16 is not set CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_CMD_BMP=y CONFIG_CMD_GPIO=y CONFIG_CMD_UNLZO=y CONFIG_CMD_I2C=y CONFIG_NET=y CONFIG_NET_DHCP=y -# CONFIG_NET_RARP is not set -# CONFIG_NET_NFS is not set CONFIG_NET_PING=y CONFIG_NET_TFTP=y - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set -CONFIG_DRIVER_SERIAL_IMX=y CONFIG_DRIVER_SERIAL_NS16550=y -CONFIG_MIIDEV=y - -# -# Network drivers -# -# CONFIG_DRIVER_NET_SMC911X is not set -# CONFIG_DRIVER_NET_SMC91111 is not set CONFIG_DRIVER_NET_FEC_IMX=y - -# -# SPI drivers -# # CONFIG_SPI is not set CONFIG_I2C=y -CONFIG_DRIVER_I2C_IMX=y -# CONFIG_DRIVER_I2C_MC13892 is not set -# CONFIG_DRIVER_I2C_MC9SDZ60 is not set -CONFIG_DRIVER_I2C_LP3972=y - -# -# flash drivers -# -CONFIG_HAS_CFI=y +CONFIG_I2C_IMX=y +CONFIG_I2C_LP3972=y CONFIG_DRIVER_CFI=y -CONFIG_DRIVER_CFI_INTEL=y # CONFIG_DRIVER_CFI_AMD is not set # CONFIG_DRIVER_CFI_BANK_WIDTH_1 is not set -CONFIG_DRIVER_CFI_BANK_WIDTH_2=y # CONFIG_DRIVER_CFI_BANK_WIDTH_4 is not set -# CONFIG_DRIVER_CFI_BANK_WIDTH_8 is not set CONFIG_CFI_BUFFER_WRITE=y -CONFIG_NAND=y -CONFIG_NAND_IMX=y -# CONFIG_NAND_IMX_BOOT is not set -# CONFIG_MTD_NAND_VERIFY_WRITE is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=y -# CONFIG_ATA is not set -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set CONFIG_VIDEO=y CONFIG_DRIVER_VIDEO_IMX=y -# CONFIG_IMXFB_DRIVER_VIDEO_IMX_OVERLAY is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set -CONFIG_PROCESS_ESCAPE_SEQUENCE=y -CONFIG_LZO_DECOMPRESS=y diff --git a/arch/arm/configs/eukrea_cpuimx35_defconfig b/arch/arm/configs/eukrea_cpuimx35_defconfig index 77f52465e6..975d09519b 100644 --- a/arch/arm/configs/eukrea_cpuimx35_defconfig +++ b/arch/arm/configs/eukrea_cpuimx35_defconfig @@ -1,133 +1,16 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2010.07.0 -# Wed Jul 28 21:46:15 2010 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_AT91RM9200 is not set -# CONFIG_ARCH_EP93XX is not set CONFIG_ARCH_IMX=y -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_S3C24xx is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_V6=y -CONFIG_CPU_32v6=y - -# -# processor features -# -CONFIG_ARCH_HAS_L2X0=y CONFIG_CACHE_L2X0=y -CONFIG_ARCH_TEXT_BASE=0x87f00000 -CONFIG_BOARDINFO="Eukrea CPUIMX35" -CONFIG_ARCH_HAS_FEC_IMX=y CONFIG_ARCH_IMX_INTERNAL_BOOT=y - -# -# Freescale i.MX System-on-Chip -# -# CONFIG_ARCH_IMX1 is not set -# CONFIG_ARCH_IMX21 is not set -# CONFIG_ARCH_IMX25 is not set -# CONFIG_ARCH_IMX27 is not set -# CONFIG_ARCH_IMX31 is not set CONFIG_ARCH_IMX35=y -CONFIG_MACH_EUKREA_CPUIMX35=y -# CONFIG_MACH_FREESCALE_MX35_3STACK is not set -# CONFIG_MACH_PCM043 is not set - -# -# Board specific settings -# - -# -# i.MX specific settings -# -# CONFIG_IMX_CLKO is not set -# CONFIG_AEABI is not set - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y -CONFIG_GENERIC_GPIO=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_MMU=y CONFIG_MMU=y -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y -CONFIG_TEXT_BASE=0x87f00000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 CONFIG_MALLOC_SIZE=0x800000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="barebox:" -CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set CONFIG_GLOB=y -CONFIG_PROMPT_HUSH_PS2="> " CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set -# CONFIG_PARTITION is not set -CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/eukrea_cpuimx35/env" - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -135,126 +18,28 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y CONFIG_CMD_ECHO_E=y - -# -# memory -# CONFIG_CMD_LOADB=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y CONFIG_CMD_MTEST=y -# CONFIG_CMD_MTEST_ALTERNATIVE is not set - -# -# flash -# CONFIG_CMD_FLASH=y -# CONFIG_CMD_UBI is not set - -# -# booting -# -CONFIG_CMD_BOOTM=y -# CONFIG_CMD_BOOTM_ZLIB is not set -# CONFIG_CMD_BOOTM_BZLIB is not set -# CONFIG_CMD_BOOTM_SHOW_TYPE is not set -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y -# CONFIG_CMD_LINUX16 is not set CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_CMD_BMP=y CONFIG_CMD_GPIO=y CONFIG_CMD_UNLZO=y CONFIG_NET=y CONFIG_NET_DHCP=y -# CONFIG_NET_NFS is not set CONFIG_NET_PING=y CONFIG_NET_TFTP=y -# CONFIG_NET_TFTP_PUSH is not set -# CONFIG_NET_NETCONSOLE is not set -# CONFIG_NET_RESOLV is not set - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set -CONFIG_DRIVER_SERIAL_IMX=y -# CONFIG_DRIVER_SERIAL_NS16550 is not set -CONFIG_MIIDEV=y - -# -# Network drivers -# -# CONFIG_DRIVER_NET_SMC911X is not set -# CONFIG_DRIVER_NET_SMC91111 is not set CONFIG_DRIVER_NET_FEC_IMX=y - -# -# SPI drivers -# # CONFIG_SPI is not set -# CONFIG_I2C is not set - -# -# flash drivers -# -# CONFIG_DRIVER_CFI is not set CONFIG_MTD=y CONFIG_NAND=y CONFIG_NAND_IMX=y CONFIG_NAND_IMX_BOOT=y -# CONFIG_MTD_NAND_VERIFY_WRITE is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=y -# CONFIG_UBI is not set -# CONFIG_ATA is not set -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set CONFIG_VIDEO=y CONFIG_DRIVER_VIDEO_IMX_IPU=y - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC32=y -CONFIG_CRC16=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set -CONFIG_PROCESS_ESCAPE_SEQUENCE=y -CONFIG_LZO_DECOMPRESS=y diff --git a/arch/arm/configs/freescale_mx25_3stack_defconfig b/arch/arm/configs/freescale_mx25_3stack_defconfig index b45b995f26..e833636eef 100644 --- a/arch/arm/configs/freescale_mx25_3stack_defconfig +++ b/arch/arm/configs/freescale_mx25_3stack_defconfig @@ -1,128 +1,14 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2.0.0-rc10 -# Fri Dec 18 11:47:29 2009 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_AT91RM9200 is not set CONFIG_ARCH_IMX=y -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_S3C24xx is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_ARM926T=y -CONFIG_CPU_32v5=y - -# -# processor features -# -CONFIG_ARCH_TEXT_BASE=0x87f00000 -CONFIG_BOARDINFO="Freescale MX25 3Stack" -CONFIG_ARCH_HAS_FEC_IMX=y -# CONFIG_ARCH_IMX_INTERNAL_BOOT is not set - -# -# Freescale i.MX System-on-Chip -# -# CONFIG_ARCH_IMX1 is not set -# CONFIG_ARCH_IMX21 is not set CONFIG_ARCH_IMX25=y -# CONFIG_ARCH_IMX27 is not set -# CONFIG_ARCH_IMX31 is not set -# CONFIG_ARCH_IMX35 is not set CONFIG_MACH_FREESCALE_MX25_3STACK=y - -# -# Board specific settings -# - -# -# i.MX specific settings -# -# CONFIG_IMX_CLKO is not set -# CONFIG_AEABI is not set - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y -CONFIG_CMDLINE_TAG=y -CONFIG_SETUP_MEMORY_TAGS=y -# CONFIG_INITRD_TAG is not set CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y -CONFIG_GENERIC_GPIO=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y CONFIG_TEXT_BASE=0x87F00000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 -CONFIG_MALLOC_SIZE=0x400000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="barebox:" -CONFIG_BAUDRATE=115200 -# CONFIG_LONGHELP is not set -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set CONFIG_GLOB=y -CONFIG_PROMPT_HUSH_PS2="> " CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y # CONFIG_ERRNO_MESSAGES is not set -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/freescale-mx25-3-stack/env/" - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -130,115 +16,19 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y - -# -# memory -# -# CONFIG_CMD_LOADB is not set CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y -# CONFIG_CMD_MTEST is not set - -# -# flash -# CONFIG_CMD_FLASH=y - -# -# booting -# -CONFIG_CMD_BOOTM=y -# CONFIG_CMD_BOOTM_ZLIB is not set -# CONFIG_CMD_BOOTM_BZLIB is not set -# CONFIG_CMD_BOOTM_SHOW_TYPE is not set -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_CMD_GPIO=y CONFIG_NET=y CONFIG_NET_DHCP=y -# CONFIG_NET_RARP is not set -# CONFIG_NET_NFS is not set CONFIG_NET_PING=y CONFIG_NET_TFTP=y - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set -CONFIG_DRIVER_SERIAL_IMX=y -# CONFIG_DRIVER_SERIAL_NS16550 is not set -CONFIG_MIIDEV=y - -# -# Network drivers -# -# CONFIG_DRIVER_NET_SMC911X is not set -# CONFIG_DRIVER_NET_SMC91111 is not set CONFIG_DRIVER_NET_FEC_IMX=y -# CONFIG_NET_USB is not set - -# -# SPI drivers -# # CONFIG_SPI is not set -# CONFIG_I2C is not set - -# -# flash drivers -# -CONFIG_HAS_CFI=y -# CONFIG_DRIVER_CFI is not set -# CONFIG_DRIVER_CFI_OLD is not set -CONFIG_NAND=y -# CONFIG_NAND_IMX is not set -# CONFIG_MTD_NAND_VERIFY_WRITE is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=y CONFIG_USB=y CONFIG_USB_EHCI=y -# CONFIG_USB_ISP1504 is not set -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set diff --git a/arch/arm/configs/freescale_mx35_3stack_defconfig b/arch/arm/configs/freescale_mx35_3stack_defconfig index ff3ba6a9e7..20c59535bf 100644 --- a/arch/arm/configs/freescale_mx35_3stack_defconfig +++ b/arch/arm/configs/freescale_mx35_3stack_defconfig @@ -1,127 +1,16 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2009.12.0-pre -# Tue Dec 22 17:43:43 2009 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_AT91RM9200 is not set CONFIG_ARCH_IMX=y -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_S3C24xx is not set - -# -# Processor Type -# -CONFIG_CPU_32=y - -# -# processor features -# -CONFIG_ARCH_TEXT_BASE=0x87f00000 -CONFIG_BOARDINFO="Freescale MX35 3Stack" -CONFIG_ARCH_HAS_FEC_IMX=y -# CONFIG_ARCH_IMX_INTERNAL_BOOT is not set - -# -# Freescale i.MX System-on-Chip -# -# CONFIG_ARCH_IMX1 is not set -# CONFIG_ARCH_IMX21 is not set -# CONFIG_ARCH_IMX25 is not set -# CONFIG_ARCH_IMX27 is not set -# CONFIG_ARCH_IMX31 is not set CONFIG_ARCH_IMX35=y CONFIG_MACH_FREESCALE_MX35_3STACK=y -# CONFIG_MACH_PCM043 is not set - -# -# Board specific settings -# - -# -# i.MX specific settings -# -# CONFIG_IMX_CLKO is not set CONFIG_AEABI=y - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y -CONFIG_CMDLINE_TAG=y -CONFIG_SETUP_MEMORY_TAGS=y -# CONFIG_INITRD_TAG is not set CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y -CONFIG_GENERIC_GPIO=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y CONFIG_TEXT_BASE=0x87F00000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 CONFIG_MALLOC_SIZE=0x1000000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="barebox:" -CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set CONFIG_GLOB=y -CONFIG_PROMPT_HUSH_PS2="> " CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/freescale-mx35-3-stack/env/" - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -129,121 +18,22 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y - -# -# memory -# -# CONFIG_CMD_LOADB is not set CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y -# CONFIG_CMD_MTEST is not set - -# -# flash -# CONFIG_CMD_FLASH=y - -# -# booting -# -CONFIG_CMD_BOOTM=y -# CONFIG_CMD_BOOTM_ZLIB is not set -# CONFIG_CMD_BOOTM_BZLIB is not set -# CONFIG_CMD_BOOTM_SHOW_TYPE is not set -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_CMD_BMP=y -# CONFIG_CMD_GPIO is not set CONFIG_NET=y CONFIG_NET_DHCP=y -# CONFIG_NET_RARP is not set -# CONFIG_NET_NFS is not set CONFIG_NET_PING=y CONFIG_NET_TFTP=y - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set -CONFIG_DRIVER_SERIAL_IMX=y -# CONFIG_DRIVER_SERIAL_NS16550 is not set -CONFIG_MIIDEV=y - -# -# Network drivers -# CONFIG_DRIVER_NET_SMC911X=y -CONFIG_DRIVER_NET_SMC911X_ADDRESS_SHIFT=0 -# CONFIG_DRIVER_NET_SMC91111 is not set CONFIG_DRIVER_NET_FEC_IMX=y - -# -# SPI drivers -# # CONFIG_SPI is not set -CONFIG_I2C=y -CONFIG_DRIVER_I2C_IMX=y -CONFIG_DRIVER_I2C_MC13892=y -CONFIG_DRIVER_I2C_MC9SDZ60=y - -# -# flash drivers -# -CONFIG_HAS_CFI=y CONFIG_DRIVER_CFI=y -# CONFIG_DRIVER_CFI_NEW is not set -CONFIG_DRIVER_CFI_OLD=y CONFIG_CFI_BUFFER_WRITE=y -CONFIG_NAND=y -CONFIG_NAND_IMX=y -CONFIG_NAND_IMX_BOOT=y -# CONFIG_MTD_NAND_VERIFY_WRITE is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=y -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set CONFIG_VIDEO=y CONFIG_DRIVER_VIDEO_IMX_IPU=y - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set diff --git a/arch/arm/configs/mmccpu_defconfig b/arch/arm/configs/mmccpu_defconfig index e196a0cf52..3f1af6a961 100644 --- a/arch/arm/configs/mmccpu_defconfig +++ b/arch/arm/configs/mmccpu_defconfig @@ -1,115 +1,13 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2.0.0-rc10 -# Fri Dec 18 11:47:54 2009 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -CONFIG_ARCH_AT91=y -# CONFIG_ARCH_AT91RM9200 is not set -# CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_S3C24xx is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_ARM926T=y -CONFIG_CPU_32v5=y - -# -# processor features -# -CONFIG_ARCH_TEXT_BASE=0x23f00000 -CONFIG_BOARDINFO="Bucyrus MMC-CPU" - -# -# Atmel AT91 System-on-Chip -# -# CONFIG_ARCH_AT91SAM9260 is not set CONFIG_ARCH_AT91SAM9263=y -# CONFIG_MACH_AT91SAM9263EK is not set CONFIG_MACH_MMCCPU=y -# CONFIG_MACH_PM9263 is not set -# CONFIG_AEABI is not set - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y -CONFIG_CMDLINE_TAG=y -CONFIG_SETUP_MEMORY_TAGS=y -# CONFIG_INITRD_TAG is not set CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y -CONFIG_GENERIC_GPIO=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y -CONFIG_TEXT_BASE=0x23f00000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 -CONFIG_MALLOC_SIZE=0x400000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="barebox:" -CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set CONFIG_GLOB=y CONFIG_PROMPT_HUSH_PS2="y" CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/mmccpu/env" - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -117,117 +15,23 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y - -# -# memory -# -# CONFIG_CMD_LOADB is not set CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y CONFIG_CMD_MTEST=y CONFIG_CMD_MTEST_ALTERNATIVE=y - -# -# flash -# CONFIG_CMD_FLASH=y - -# -# booting -# -CONFIG_CMD_BOOTM=y -# CONFIG_CMD_BOOTM_ZLIB is not set -# CONFIG_CMD_BOOTM_BZLIB is not set CONFIG_CMD_BOOTM_SHOW_TYPE=y -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_CMD_GPIO=y CONFIG_NET=y CONFIG_NET_DHCP=y -# CONFIG_NET_RARP is not set -# CONFIG_NET_NFS is not set CONFIG_NET_PING=y CONFIG_NET_TFTP=y - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set -# CONFIG_DRIVER_SERIAL_NS16550 is not set -CONFIG_DRIVER_SERIAL_ATMEL=y -CONFIG_MIIDEV=y - -# -# Network drivers -# -# CONFIG_DRIVER_NET_SMC911X is not set -# CONFIG_DRIVER_NET_SMC91111 is not set CONFIG_DRIVER_NET_MACB=y - -# -# SPI drivers -# # CONFIG_SPI is not set CONFIG_I2C=y -# CONFIG_DRIVER_I2C_MC13892 is not set -# CONFIG_DRIVER_I2C_MC9SDZ60 is not set - -# -# flash drivers -# CONFIG_DRIVER_CFI=y -CONFIG_DRIVER_CFI_NEW=y -CONFIG_DRIVER_CFI_INTEL=y -CONFIG_DRIVER_CFI_AMD=y -CONFIG_DRIVER_CFI_BANK_WIDTH_1=y -CONFIG_DRIVER_CFI_BANK_WIDTH_2=y -CONFIG_DRIVER_CFI_BANK_WIDTH_4=y -# CONFIG_DRIVER_CFI_BANK_WIDTH_8 is not set CONFIG_CFI_BUFFER_WRITE=y -# CONFIG_NAND is not set -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set diff --git a/arch/arm/configs/mx21ads_defconfig b/arch/arm/configs/mx21ads_defconfig index 99b5ed6aa4..52f84e1e9a 100644 --- a/arch/arm/configs/mx21ads_defconfig +++ b/arch/arm/configs/mx21ads_defconfig @@ -1,126 +1,13 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2.0.0-rc10 -# Fri Dec 18 11:48:02 2009 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_AT91RM9200 is not set CONFIG_ARCH_IMX=y -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_S3C24xx is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_ARM926T=y -CONFIG_CPU_32v5=y - -# -# processor features -# -CONFIG_ARCH_TEXT_BASE=0xc0000000 -CONFIG_BOARDINFO="Freescale i.MX21 ADS" - -# -# Freescale i.MX System-on-Chip -# -# CONFIG_ARCH_IMX1 is not set CONFIG_ARCH_IMX21=y -# CONFIG_ARCH_IMX25 is not set -# CONFIG_ARCH_IMX27 is not set -# CONFIG_ARCH_IMX31 is not set -# CONFIG_ARCH_IMX35 is not set -CONFIG_MACH_IMX21ADS=y - -# -# Board specific settings -# - -# -# i.MX specific settings -# CONFIG_IMX_CLKO=y -# CONFIG_AEABI is not set - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y -CONFIG_CMDLINE_TAG=y -CONFIG_SETUP_MEMORY_TAGS=y -# CONFIG_INITRD_TAG is not set CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y -CONFIG_GENERIC_GPIO=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y CONFIG_TEXT_BASE=0xc1000000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 -CONFIG_MALLOC_SIZE=0x400000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="barebox:" -CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set -# CONFIG_GLOB is not set -CONFIG_PROMPT_HUSH_PS2="> " CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/imx21ads/env" - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -128,121 +15,24 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y - -# -# memory -# -# CONFIG_CMD_LOADB is not set CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y CONFIG_CMD_MTEST=y CONFIG_CMD_MTEST_ALTERNATIVE=y - -# -# flash -# CONFIG_CMD_FLASH=y - -# -# booting -# -CONFIG_CMD_BOOTM=y -# CONFIG_CMD_BOOTM_ZLIB is not set -# CONFIG_CMD_BOOTM_BZLIB is not set CONFIG_CMD_BOOTM_SHOW_TYPE=y -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_CMD_GPIO=y CONFIG_NET=y CONFIG_NET_DHCP=y -# CONFIG_NET_RARP is not set CONFIG_NET_NFS=y CONFIG_NET_PING=y CONFIG_NET_TFTP=y - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set -CONFIG_DRIVER_SERIAL_IMX=y -# CONFIG_DRIVER_SERIAL_NS16550 is not set -CONFIG_HAS_CS8900=y - -# -# Network drivers -# CONFIG_DRIVER_NET_CS8900=y -# CONFIG_DRIVER_NET_SMC911X is not set -# CONFIG_DRIVER_NET_SMC91111 is not set - -# -# SPI drivers -# # CONFIG_SPI is not set -# CONFIG_I2C is not set - -# -# flash drivers -# -CONFIG_HAS_CFI=y CONFIG_DRIVER_CFI=y -CONFIG_DRIVER_CFI_NEW=y # CONFIG_DRIVER_CFI_INTEL is not set -CONFIG_DRIVER_CFI_AMD=y -CONFIG_DRIVER_CFI_BANK_WIDTH_1=y -CONFIG_DRIVER_CFI_BANK_WIDTH_2=y -CONFIG_DRIVER_CFI_BANK_WIDTH_4=y -# CONFIG_DRIVER_CFI_BANK_WIDTH_8 is not set CONFIG_CFI_BUFFER_WRITE=y -CONFIG_NAND=y -CONFIG_NAND_IMX=y -# CONFIG_NAND_IMX_BOOT is not set -# CONFIG_MTD_NAND_VERIFY_WRITE is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=y -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set diff --git a/arch/arm/configs/mx27ads_defconfig b/arch/arm/configs/mx27ads_defconfig index a1bf3f9412..e92fb9c8f5 100644 --- a/arch/arm/configs/mx27ads_defconfig +++ b/arch/arm/configs/mx27ads_defconfig @@ -1,130 +1,14 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2.0.0-rc10 -# Fri Dec 18 11:48:21 2009 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_AT91RM9200 is not set CONFIG_ARCH_IMX=y -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_S3C24xx is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_ARM926T=y -CONFIG_CPU_32v5=y - -# -# processor features -# -CONFIG_ARCH_TEXT_BASE=0xa0000000 -CONFIG_BOARDINFO="Freescale i.MX27 ADS" -CONFIG_ARCH_HAS_FEC_IMX=y - -# -# Freescale i.MX System-on-Chip -# -# CONFIG_ARCH_IMX1 is not set -# CONFIG_ARCH_IMX21 is not set -# CONFIG_ARCH_IMX25 is not set CONFIG_ARCH_IMX27=y -# CONFIG_ARCH_IMX31 is not set -# CONFIG_ARCH_IMX35 is not set -# CONFIG_MACH_EUKREA_CPUIMX27 is not set CONFIG_MACH_IMX27ADS=y -# CONFIG_MACH_PCA100 is not set -# CONFIG_MACH_PCM038 is not set - -# -# Board specific settings -# - -# -# i.MX specific settings -# CONFIG_IMX_CLKO=y -# CONFIG_AEABI is not set - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y -CONFIG_CMDLINE_TAG=y -CONFIG_SETUP_MEMORY_TAGS=y -# CONFIG_INITRD_TAG is not set CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y -CONFIG_GENERIC_GPIO=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y CONFIG_TEXT_BASE=0xa7f00000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 -CONFIG_MALLOC_SIZE=0x400000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="barebox:" -CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set -# CONFIG_GLOB is not set -CONFIG_PROMPT_HUSH_PS2="> " CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/imx27ads/env" - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -132,117 +16,23 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y - -# -# memory -# -# CONFIG_CMD_LOADB is not set CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y CONFIG_CMD_MTEST=y CONFIG_CMD_MTEST_ALTERNATIVE=y - -# -# flash -# CONFIG_CMD_FLASH=y - -# -# booting -# -CONFIG_CMD_BOOTM=y -# CONFIG_CMD_BOOTM_ZLIB is not set -# CONFIG_CMD_BOOTM_BZLIB is not set CONFIG_CMD_BOOTM_SHOW_TYPE=y -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_CMD_GPIO=y CONFIG_NET=y CONFIG_NET_DHCP=y -# CONFIG_NET_RARP is not set -# CONFIG_NET_NFS is not set CONFIG_NET_PING=y CONFIG_NET_TFTP=y - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set -CONFIG_DRIVER_SERIAL_IMX=y -# CONFIG_DRIVER_SERIAL_NS16550 is not set - -# -# Network drivers -# -# CONFIG_DRIVER_NET_SMC911X is not set -# CONFIG_DRIVER_NET_SMC91111 is not set -# CONFIG_DRIVER_NET_FEC_IMX is not set - -# -# SPI drivers -# -CONFIG_SPI=y CONFIG_DRIVER_SPI_IMX=y CONFIG_DRIVER_SPI_MC13783=y -# CONFIG_I2C is not set - -# -# flash drivers -# -CONFIG_HAS_CFI=y CONFIG_DRIVER_CFI=y -CONFIG_DRIVER_CFI_NEW=y # CONFIG_DRIVER_CFI_INTEL is not set -CONFIG_DRIVER_CFI_AMD=y -CONFIG_DRIVER_CFI_BANK_WIDTH_1=y -CONFIG_DRIVER_CFI_BANK_WIDTH_2=y -CONFIG_DRIVER_CFI_BANK_WIDTH_4=y -# CONFIG_DRIVER_CFI_BANK_WIDTH_8 is not set CONFIG_CFI_BUFFER_WRITE=y -# CONFIG_NAND is not set -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set diff --git a/arch/arm/configs/neso_defconfig b/arch/arm/configs/neso_defconfig index 03673f2b2c..9f6e3f4b94 100644 --- a/arch/arm/configs/neso_defconfig +++ b/arch/arm/configs/neso_defconfig @@ -1,132 +1,18 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2010.06.0 -# Mon Jun 21 14:06:11 2010 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_AT91RM9200 is not set -# CONFIG_ARCH_EP93XX is not set CONFIG_ARCH_IMX=y -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_S3C24xx is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_ARM926T=y -CONFIG_CPU_32v5=y - -# -# processor features -# -CONFIG_ARCH_TEXT_BASE=0xa7e00000 -CONFIG_BOARDINFO="Garz+Fricke Neso" -CONFIG_ARCH_HAS_FEC_IMX=y - -# -# Freescale i.MX System-on-Chip -# -# CONFIG_ARCH_IMX1 is not set -# CONFIG_ARCH_IMX21 is not set -# CONFIG_ARCH_IMX25 is not set CONFIG_ARCH_IMX27=y -# CONFIG_ARCH_IMX31 is not set -# CONFIG_ARCH_IMX35 is not set -# CONFIG_MACH_EUKREA_CPUIMX27 is not set -# CONFIG_MACH_IMX27ADS is not set -# CONFIG_MACH_PCA100 is not set -# CONFIG_MACH_PCM038 is not set CONFIG_MACH_NESO=y - -# -# Board specific settings -# - -# -# i.MX specific settings -# CONFIG_IMX_CLKO=y CONFIG_AEABI=y - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y -CONFIG_GENERIC_GPIO=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_MMU=y CONFIG_MMU=y -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y -CONFIG_TEXT_BASE=0xa7e00000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 CONFIG_MALLOC_SIZE=0x1000000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="barebox:" -CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set CONFIG_GLOB=y -CONFIG_PROMPT_HUSH_PS2="> " CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT=y -CONFIG_DEFAULT_ENVIRONMENT_PATH="defaultenv board/guf-neso/env" - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# +CONFIG_DEFAULT_ENVIRONMENT_PATH="defaultenv arch/arm/boards/guf-neso/env" CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -134,62 +20,15 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y CONFIG_CMD_ECHO_E=y - -# -# memory -# -# CONFIG_CMD_LOADB is not set CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y CONFIG_CMD_MTEST=y -# CONFIG_CMD_MTEST_ALTERNATIVE is not set - -# -# flash -# CONFIG_CMD_FLASH=y - -# -# booting -# -CONFIG_CMD_BOOTM=y -# CONFIG_CMD_BOOTM_ZLIB is not set -# CONFIG_CMD_BOOTM_BZLIB is not set -# CONFIG_CMD_BOOTM_SHOW_TYPE is not set -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y -# CONFIG_CMD_LINUX16 is not set CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_CMD_BMP=y CONFIG_CMD_GPIO=y CONFIG_CMD_UNLZO=y @@ -201,64 +40,19 @@ CONFIG_NET_TFTP=y CONFIG_NET_TFTP_PUSH=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set -CONFIG_DRIVER_SERIAL_IMX=y -# CONFIG_DRIVER_SERIAL_NS16550 is not set -CONFIG_MIIDEV=y - -# -# Network drivers -# -# CONFIG_DRIVER_NET_SMC911X is not set -# CONFIG_DRIVER_NET_SMC91111 is not set CONFIG_DRIVER_NET_FEC_IMX=y CONFIG_NET_USB=y CONFIG_NET_USB_ASIX=y -# CONFIG_NET_USB_SMSC95XX is not set - -# -# SPI drivers -# -CONFIG_SPI=y CONFIG_DRIVER_SPI_IMX=y CONFIG_DRIVER_SPI_MC13783=y -# CONFIG_I2C is not set - -# -# flash drivers -# -# CONFIG_DRIVER_CFI is not set +CONFIG_MTD=y CONFIG_NAND=y CONFIG_NAND_IMX=y CONFIG_NAND_IMX_BOOT=y -# CONFIG_MTD_NAND_VERIFY_WRITE is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=y -# CONFIG_ATA is not set +CONFIG_UBI=y CONFIG_USB=y CONFIG_USB_EHCI=y -CONFIG_USB_ULPI=y CONFIG_USB_ISP1504=y -# CONFIG_USB_GADGET is not set CONFIG_VIDEO=y CONFIG_DRIVER_VIDEO_IMX=y CONFIG_IMXFB_DRIVER_VIDEO_IMX_OVERLAY=y - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set -CONFIG_PROCESS_ESCAPE_SEQUENCE=y -CONFIG_LZO_DECOMPRESS=y diff --git a/arch/arm/configs/netx_nxdb500_defconfig b/arch/arm/configs/netx_nxdb500_defconfig index 7047d6b5ba..179058be65 100644 --- a/arch/arm/configs/netx_nxdb500_defconfig +++ b/arch/arm/configs/netx_nxdb500_defconfig @@ -1,110 +1,11 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2.0.0-rc10 -# Fri Dec 18 11:48:29 2009 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_AT91RM9200 is not set -# CONFIG_ARCH_IMX is not set CONFIG_ARCH_NETX=y -# CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_S3C24xx is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_ARM926T=y -CONFIG_CPU_32v5=y - -# -# processor features -# -CONFIG_ARCH_TEXT_BASE=0x81f00000 -CONFIG_BOARDINFO="Hilscher Netx nxdb500" -CONFIG_NETX_SDRAM_CTRL=0x010D0121 -CONFIG_NETX_SDRAM_TIMING_CTRL=0x03C13261 -CONFIG_NETX_MEM_CTRL=0x0203030F -CONFIG_NETX_COOKIE=32 -CONFIG_MACH_NXDB500=y -# CONFIG_AEABI is not set - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y -CONFIG_CMDLINE_TAG=y -CONFIG_SETUP_MEMORY_TAGS=y -CONFIG_INITRD_TAG=y -# CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS is not set -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y CONFIG_TEXT_BASE=0x08f80000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 -CONFIG_MALLOC_SIZE=0x400000 CONFIG_BROKEN=y -# CONFIG_EXPERIMENTAL is not set -# CONFIG_KALLSYMS is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="barebox:" -CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set -# CONFIG_GLOB is not set -CONFIG_PROMPT_HUSH_PS2="> " CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y # CONFIG_DEFAULT_ENVIRONMENT is not set - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -112,112 +13,17 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y - -# -# memory -# -# CONFIG_CMD_LOADB is not set -# CONFIG_CMD_LOADS is not set CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y -# CONFIG_CMD_MTEST is not set - -# -# flash -# CONFIG_CMD_FLASH=y - -# -# booting -# -CONFIG_CMD_BOOTM=y -# CONFIG_CMD_BOOTM_ZLIB is not set -# CONFIG_CMD_BOOTM_BZLIB is not set -# CONFIG_CMD_BOOTM_SHOW_TYPE is not set -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_NET=y CONFIG_NET_DHCP=y -# CONFIG_NET_RARP is not set -# CONFIG_NET_NFS is not set CONFIG_NET_PING=y CONFIG_NET_TFTP=y - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set -CONFIG_DRIVER_SERIAL_NETX=y -# CONFIG_DRIVER_SERIAL_NS16550 is not set -CONFIG_HAS_NETX_ETHER=y -CONFIG_MIIDEV=y - -# -# Network drivers -# -# CONFIG_DRIVER_NET_SMC911X is not set -# CONFIG_DRIVER_NET_SMC91111 is not set CONFIG_DRIVER_NET_NETX=y - -# -# SPI drivers -# -CONFIG_SPI=y -# CONFIG_DRIVER_SPI_MC13783 is not set -# CONFIG_I2C is not set - -# -# flash drivers -# -CONFIG_HAS_CFI=y CONFIG_DRIVER_CFI=y -# CONFIG_DRIVER_CFI_NEW is not set -CONFIG_DRIVER_CFI_OLD=y CONFIG_CFI_BUFFER_WRITE=y -# CONFIG_NAND is not set -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set diff --git a/arch/arm/configs/nhk8815_defconfig b/arch/arm/configs/nhk8815_defconfig index 21d596f8b7..e3f41025ce 100644 --- a/arch/arm/configs/nhk8815_defconfig +++ b/arch/arm/configs/nhk8815_defconfig @@ -1,110 +1,16 @@ -# -# Automatically generated make config: don't edit -# U-Boot version: 2.0.0-rc10 -# Mon Oct 12 18:36:24 2009 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y -CONFIG_ARM_AMBA=y - -# -# System Type -# -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_AT91RM9200 is not set -# CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_NETX is not set CONFIG_ARCH_NOMADIK=y -# CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_S3C24xx is not set -CONFIG_COMMON_CLKDEV=y - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_ARM926T=y -CONFIG_CPU_32v5=y - -# -# processor features -# -CONFIG_ARCH_TEXT_BASE=0x03c00000 -CONFIG_BOARDINFO="NHK8815" -CONFIG_MACH_NOMADIK_8815NHK=y -CONFIG_NOMADIK_8815=y -# CONFIG_AEABI is not set - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y -CONFIG_CMDLINE_TAG=y -CONFIG_SETUP_MEMORY_TAGS=y -# CONFIG_INITRD_TAG is not set CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y CONFIG_TEXT_BASE=0x03F80000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 -CONFIG_MALLOC_SIZE=0x400000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set CONFIG_PROMPT="Nomadik:" -CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set CONFIG_GLOB=y -CONFIG_PROMPT_HUSH_PS2="> " -# CONFIG_HUSH_FANCY_PROMPT is not set +CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set +CONFIG_MENU=y +CONFIG_PASSWD_SUM_SHA1=y CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT=y -CONFIG_DEFAULT_ENVIRONMENT_PATH="board/nhk8815/env" - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# +CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/nhk8815/env" CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -112,121 +18,39 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y -# CONFIG_CMD_ECHO_E is not set - -# -# memory -# -# CONFIG_CMD_LOADB is not set +CONFIG_CMD_MENU=y +CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_PASSWD=y +CONFIG_CMD_ECHO_E=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y CONFIG_CMD_MTEST=y -# CONFIG_CMD_MTEST_ALTERNATIVE is not set - -# -# flash -# CONFIG_CMD_FLASH=y -# CONFIG_CMD_UBI is not set - -# -# booting -# -CONFIG_CMD_BOOTM=y CONFIG_CMD_BOOTM_ZLIB=y CONFIG_CMD_BOOTM_BZLIB=y CONFIG_CMD_BOOTM_SHOW_TYPE=y -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y -# CONFIG_CMD_LINUX16 is not set CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y -# CONFIG_CMD_UNLZO is not set +CONFIG_CMD_UNLZO=y CONFIG_NET=y CONFIG_NET_DHCP=y CONFIG_NET_NFS=y CONFIG_NET_PING=y CONFIG_NET_TFTP=y -# CONFIG_NET_TFTP_PUSH is not set -# CONFIG_NET_NETCONSOLE is not set -# CONFIG_NET_RESOLV is not set - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set +CONFIG_NET_TFTP_PUSH=y +CONFIG_NET_NETCONSOLE=y +CONFIG_NET_RESOLV=y CONFIG_SERIAL_AMBA_PL011=y -# CONFIG_DRIVER_SERIAL_NS16550 is not set -CONFIG_MIIDEV=y - -# -# Network drivers -# -# CONFIG_DRIVER_NET_SMC911X is not set CONFIG_DRIVER_NET_SMC91111=y - -# -# SPI drivers -# # CONFIG_SPI is not set -# CONFIG_I2C is not set - -# -# flash drivers -# -# CONFIG_DRIVER_CFI is not set CONFIG_MTD=y CONFIG_NAND=y CONFIG_MTD_NAND_VERIFY_WRITE=y CONFIG_MTD_NAND_ECC_SMC=y -CONFIG_MTD_NAND_IDS=y CONFIG_MTD_NAND_NOMADIK=y -# CONFIG_UBI is not set -# CONFIG_ATA is not set -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_ZLIB=y -CONFIG_BZLIB=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set -# CONFIG_PROCESS_ESCAPE_SEQUENCE is not set +CONFIG_UBI=y +CONFIG_FS_CRAMFS=y +CONFIG_MD5=y +CONFIG_SHA256=y diff --git a/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig b/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig index 4501f5ac9f..013d000589 100644 --- a/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig +++ b/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig @@ -1,139 +1,18 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2.0.0-rc10 -# Fri Dec 18 11:48:53 2009 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_AT91RM9200 is not set -# CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_NETX is not set CONFIG_ARCH_OMAP=y -# CONFIG_ARCH_S3C24xx is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_V7=y -CONFIG_CPU_32v7=y - -# -# processor features -# -CONFIG_ARCH_TEXT_BASE=0x80e80000 -CONFIG_BOARDINFO="Texas Instrument's SDP343x" - -# -# OMAP Features -# -CONFIG_ARCH_OMAP3=y -CONFIG_OMAP_CONFIG_STACKSIZE=0x00008000 -CONFIG_OMAP_MALLOC_LEN=0x00008000 -CONFIG_OMAP_CLOCK_ALL=y -CONFIG_OMAP_CLOCK_SOURCE_S32K=y -CONFIG_OMAP3_CLOCK_CONFIG=y # CONFIG_OMAP3_COPY_CLOCK_SRAM is not set -CONFIG_GPMC=y - -# -# OMAP Platform Features -# -CONFIG_MACH_OMAP343xSDP=y -# CONFIG_MACH_BEAGLE is not set -# CONFIG_MACH_OMAP3EVM is not set -# CONFIG_MACH_OMAP_ADVANCED_MUX is not set -CONFIG_HAS_OMAP_NAND=y -# CONFIG_MACH_OMAP_GPMC_NAND is not set -# CONFIG_AEABI is not set - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y -CONFIG_CMDLINE_TAG=y -CONFIG_SETUP_MEMORY_TAGS=y -# CONFIG_INITRD_TAG is not set -# CONFIG_CPU_V7_DCACHE_SKIP is not set CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y # CONFIG_CMD_MEMORY is not set - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y CONFIG_TEXT_BASE=0x40200000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -# CONFIG_MEMORY_LAYOUT_DEFAULT is not set CONFIG_MEMORY_LAYOUT_FIXED=y CONFIG_STACK_BASE=0x87BF7F10 -CONFIG_STACK_SIZE=0x8000 CONFIG_MALLOC_BASE=0x87BFFF10 -CONFIG_MALLOC_SIZE=0x400000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_ARCH_HAS_LOWLEVEL_INIT=y CONFIG_PROMPT="X-load 343x> " -CONFIG_BAUDRATE=115200 -CONFIG_SIMPLE_READLINE=y CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -# CONFIG_SHELL_HUSH is not set CONFIG_SHELL_SIMPLE=y -# CONFIG_CMDLINE_EDITING is not set # CONFIG_ERRNO_MESSAGES is not set # CONFIG_TIMESTAMP is not set -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set -# CONFIG_PARTITION is not set # CONFIG_DEFAULT_ENVIRONMENT is not set - -# -# Debugging -# CONFIG_DEBUG_INFO=y -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# -# CONFIG_CMD_EDIT is not set -# CONFIG_CMD_EXEC is not set -# CONFIG_CMD_SLEEP is not set -# CONFIG_CMD_SAVEENV is not set -# CONFIG_CMD_LOADENV is not set -# CONFIG_CMD_EXPORT is not set -# CONFIG_CMD_PRINTENV is not set -# CONFIG_CMD_READLINE is not set -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# # CONFIG_CMD_LS is not set # CONFIG_CMD_RM is not set # CONFIG_CMD_CAT is not set @@ -144,73 +23,12 @@ CONFIG_CMD_FALSE=y # CONFIG_CMD_CD is not set # CONFIG_CMD_MOUNT is not set # CONFIG_CMD_UMOUNT is not set - -# -# console -# # CONFIG_CMD_CLEAR is not set # CONFIG_CMD_ECHO is not set - -# -# memory -# CONFIG_CMD_LOADB=y -# CONFIG_CMD_MEMINFO is not set -# CONFIG_CMD_CRC is not set -# CONFIG_CMD_MTEST is not set - -# -# flash -# -# CONFIG_CMD_FLASH is not set - -# -# booting -# # CONFIG_CMD_BOOTM is not set -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y -# CONFIG_CMD_RESET is not set CONFIG_CMD_GO=y -# CONFIG_CMD_TIMEOUT is not set -# CONFIG_CMD_PARTITION is not set -CONFIG_CMD_VERSION=y # CONFIG_CMD_HELP is not set -CONFIG_CMD_DEVINFO=y -# CONFIG_NET is not set - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y - -# -# SPI drivers -# # CONFIG_SPI is not set -# CONFIG_I2C is not set - -# -# flash drivers -# -# CONFIG_DRIVER_CFI is not set -# CONFIG_DRIVER_CFI_OLD is not set -# CONFIG_NAND is not set -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC16=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set diff --git a/arch/arm/configs/omap3530_beagle_defconfig b/arch/arm/configs/omap3530_beagle_defconfig index 41b8d87ade..d4b8737406 100644 --- a/arch/arm/configs/omap3530_beagle_defconfig +++ b/arch/arm/configs/omap3530_beagle_defconfig @@ -1,125 +1,17 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2010.08.0 -# Tue Aug 10 18:52:24 2010 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_AT91RM9200 is not set -# CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_NOMADIK is not set CONFIG_ARCH_OMAP=y -# CONFIG_ARCH_S3C24xx is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_V7=y -CONFIG_CPU_32v7=y - -# -# processor features -# -CONFIG_ARCH_TEXT_BASE=0x80e80000 -CONFIG_BOARDINFO="Texas Instrument's Beagle" - -# -# OMAP Features -# -CONFIG_ARCH_OMAP3=y -CONFIG_OMAP_CLOCK_ALL=y -CONFIG_OMAP_CLOCK_SOURCE_S32K=y -CONFIG_OMAP3_CLOCK_CONFIG=y # CONFIG_OMAP3_COPY_CLOCK_SRAM is not set -CONFIG_GPMC=y -CONFIG_GPIO=y - -# -# OMAP Platform Features -# -# CONFIG_MACH_OMAP343xSDP is not set CONFIG_MACH_BEAGLE=y -# CONFIG_MACH_OMAP3EVM is not set -CONFIG_HAS_OMAP_NAND=y CONFIG_AEABI=y - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y -# CONFIG_CPU_V7_DCACHE_SKIP is not set -# CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS is not set -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y -CONFIG_GENERIC_GPIO=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y CONFIG_TEXT_BASE=0x81000000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 -CONFIG_MALLOC_SIZE=0x400000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_ARCH_HAS_LOWLEVEL_INIT=y CONFIG_PROMPT="barebox> " -CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set CONFIG_GLOB=y -CONFIG_PROMPT_HUSH_PS2="> " CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y # CONFIG_TIMESTAMP is not set -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y # CONFIG_DEFAULT_ENVIRONMENT is not set - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -127,60 +19,14 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y CONFIG_CMD_ECHO_E=y - -# -# memory -# CONFIG_CMD_LOADB=y -# CONFIG_CMD_MEMINFO is not set -# CONFIG_CMD_CRC is not set -# CONFIG_CMD_MTEST is not set - -# -# flash -# CONFIG_CMD_FLASH=y -# CONFIG_CMD_UBI is not set - -# -# booting -# # CONFIG_CMD_BOOTM is not set -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y -# CONFIG_CMD_LINUX16 is not set CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y -# CONFIG_CMD_GPIO is not set CONFIG_CMD_UNLZO=y CONFIG_CMD_I2C=y CONFIG_NET=y @@ -188,70 +34,18 @@ CONFIG_NET_DHCP=y CONFIG_NET_NFS=y CONFIG_NET_PING=y CONFIG_NET_TFTP=y -# CONFIG_NET_TFTP_PUSH is not set -# CONFIG_NET_NETCONSOLE is not set -# CONFIG_NET_RESOLV is not set - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y -CONFIG_MIIDEV=y - -# -# Network drivers -# -# CONFIG_DRIVER_NET_SMC911X is not set -# CONFIG_DRIVER_NET_SMC91111 is not set CONFIG_NET_USB=y CONFIG_NET_USB_ASIX=y - -# -# SPI drivers -# # CONFIG_SPI is not set CONFIG_I2C=y -CONFIG_DRIVER_I2C_OMAP=y -# CONFIG_DRIVER_I2C_MC13892 is not set -# CONFIG_DRIVER_I2C_MC34704 is not set -# CONFIG_DRIVER_I2C_MC9SDZ60 is not set -# CONFIG_DRIVER_I2C_LP3972 is not set -CONFIG_DRIVER_I2C_TWL4030=y - -# -# flash drivers -# -# CONFIG_DRIVER_CFI is not set +CONFIG_I2C_OMAP=y +CONFIG_I2C_TWL4030=y CONFIG_MTD=y CONFIG_NAND=y CONFIG_NAND_OMAP_GPMC=y -# CONFIG_MTD_NAND_VERIFY_WRITE is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=y -# CONFIG_UBI is not set -# CONFIG_ATA is not set CONFIG_USB=y CONFIG_USB_EHCI=y CONFIG_USB_EHCI_OMAP=y -# CONFIG_USB_ISP1504 is not set CONFIG_USB_TWL4030=y -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC32=y -CONFIG_CRC16=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set -CONFIG_PROCESS_ESCAPE_SEQUENCE=y -CONFIG_LZO_DECOMPRESS=y diff --git a/arch/arm/configs/omap3530_beagle_per_uart_defconfig b/arch/arm/configs/omap3530_beagle_per_uart_defconfig index 76fbe84c6b..f574666342 100644 --- a/arch/arm/configs/omap3530_beagle_per_uart_defconfig +++ b/arch/arm/configs/omap3530_beagle_per_uart_defconfig @@ -1,138 +1,16 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2.0.0-rc10 -# Fri Dec 18 11:49:08 2009 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_AT91RM9200 is not set -# CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_NETX is not set CONFIG_ARCH_OMAP=y -# CONFIG_ARCH_S3C24xx is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_V7=y -CONFIG_CPU_32v7=y - -# -# processor features -# -CONFIG_ARCH_TEXT_BASE=0x80e80000 -CONFIG_BOARDINFO="Texas Instrument's Beagle" - -# -# OMAP Features -# -CONFIG_ARCH_OMAP3=y -CONFIG_OMAP_CONFIG_STACKSIZE=0x00008000 -CONFIG_OMAP_MALLOC_LEN=0x00008000 -CONFIG_OMAP_CLOCK_ALL=y -CONFIG_OMAP_CLOCK_SOURCE_S32K=y -CONFIG_OMAP3_CLOCK_CONFIG=y # CONFIG_OMAP3_COPY_CLOCK_SRAM is not set -CONFIG_GPMC=y - -# -# OMAP Platform Features -# -# CONFIG_MACH_OMAP343xSDP is not set CONFIG_MACH_BEAGLE=y -# CONFIG_MACH_OMAP3EVM is not set -CONFIG_HAS_OMAP_NAND=y -# CONFIG_MACH_OMAP_GPMC_NAND is not set -# CONFIG_AEABI is not set - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y -CONFIG_CMDLINE_TAG=y -CONFIG_SETUP_MEMORY_TAGS=y -# CONFIG_INITRD_TAG is not set -# CONFIG_CPU_V7_DCACHE_SKIP is not set -# CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS is not set -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y CONFIG_TEXT_BASE=0x40200000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -# CONFIG_MEMORY_LAYOUT_DEFAULT is not set CONFIG_MEMORY_LAYOUT_FIXED=y CONFIG_STACK_BASE=0x87BF7F10 -CONFIG_STACK_SIZE=0x8000 CONFIG_MALLOC_BASE=0x87BFFF10 -CONFIG_MALLOC_SIZE=0x400000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_ARCH_HAS_LOWLEVEL_INIT=y CONFIG_PROMPT="X-load Beagle>" -CONFIG_BAUDRATE=115200 -CONFIG_SIMPLE_READLINE=y CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -# CONFIG_SHELL_HUSH is not set CONFIG_SHELL_SIMPLE=y -# CONFIG_CMDLINE_EDITING is not set # CONFIG_ERRNO_MESSAGES is not set # CONFIG_TIMESTAMP is not set -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set -# CONFIG_PARTITION is not set # CONFIG_DEFAULT_ENVIRONMENT is not set - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# -# CONFIG_CMD_EDIT is not set -# CONFIG_CMD_EXEC is not set -# CONFIG_CMD_SLEEP is not set -# CONFIG_CMD_SAVEENV is not set -# CONFIG_CMD_LOADENV is not set -# CONFIG_CMD_EXPORT is not set -# CONFIG_CMD_PRINTENV is not set -# CONFIG_CMD_READLINE is not set -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# # CONFIG_CMD_LS is not set # CONFIG_CMD_RM is not set # CONFIG_CMD_CAT is not set @@ -143,73 +21,12 @@ CONFIG_CMD_FALSE=y # CONFIG_CMD_CD is not set # CONFIG_CMD_MOUNT is not set # CONFIG_CMD_UMOUNT is not set - -# -# console -# # CONFIG_CMD_CLEAR is not set # CONFIG_CMD_ECHO is not set - -# -# memory -# CONFIG_CMD_LOADB=y -# CONFIG_CMD_MEMINFO is not set -# CONFIG_CMD_CRC is not set -# CONFIG_CMD_MTEST is not set - -# -# flash -# -# CONFIG_CMD_FLASH is not set - -# -# booting -# # CONFIG_CMD_BOOTM is not set -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y -# CONFIG_CMD_RESET is not set CONFIG_CMD_GO=y -# CONFIG_CMD_TIMEOUT is not set -# CONFIG_CMD_PARTITION is not set -CONFIG_CMD_VERSION=y # CONFIG_CMD_HELP is not set -CONFIG_CMD_DEVINFO=y -# CONFIG_NET is not set - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y - -# -# SPI drivers -# # CONFIG_SPI is not set -# CONFIG_I2C is not set - -# -# flash drivers -# -# CONFIG_DRIVER_CFI is not set -# CONFIG_DRIVER_CFI_OLD is not set -# CONFIG_NAND is not set -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC16=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set diff --git a/arch/arm/configs/omap3_evm_defconfig b/arch/arm/configs/omap3_evm_defconfig index abf60e65b0..3fe2647fde 100644 --- a/arch/arm/configs/omap3_evm_defconfig +++ b/arch/arm/configs/omap3_evm_defconfig @@ -1,216 +1,30 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2009.12.0-pre -# Fri Dec 18 16:39:27 2009 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_AT91RM9200 is not set -# CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_NETX is not set CONFIG_ARCH_OMAP=y -# CONFIG_ARCH_S3C24xx is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_V7=y -CONFIG_CPU_32v7=y - -# -# processor features -# -CONFIG_BOARDINFO="Texas Instrument's OMAP3EVM" - -# -# OMAP Features -# -CONFIG_ARCH_OMAP3=y -CONFIG_OMAP_CONFIG_STACKSIZE=0x00008000 -CONFIG_OMAP_MALLOC_LEN=0x00008000 -CONFIG_OMAP_CLOCK_ALL=y -CONFIG_OMAP_CLOCK_SOURCE_S32K=y -CONFIG_OMAP3_CLOCK_CONFIG=y # CONFIG_OMAP3_COPY_CLOCK_SRAM is not set -CONFIG_GPMC=y - -# -# OMAP Platform Features -# -# CONFIG_MACH_OMAP343xSDP is not set -# CONFIG_MACH_BEAGLE is not set CONFIG_MACH_OMAP3EVM=y -CONFIG_OMAP3EVM_UART1=y -# CONFIG_OMAP3EVM_UART3 is not set -CONFIG_HAS_OMAP_NAND=y -# CONFIG_MACH_OMAP_GPMC_NAND is not set CONFIG_AEABI=y - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y -# CONFIG_CMDLINE_TAG is not set -# CONFIG_SETUP_MEMORY_TAGS is not set -# CONFIG_INITRD_TAG is not set -# CONFIG_CPU_V7_DCACHE_SKIP is not set -# CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS is not set -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y # CONFIG_CMD_MEMORY is not set - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y CONFIG_TEXT_BASE=0x40200000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -# CONFIG_MEMORY_LAYOUT_DEFAULT is not set CONFIG_MEMORY_LAYOUT_FIXED=y CONFIG_STACK_BASE=0x87BF7F10 -CONFIG_STACK_SIZE=0x8000 CONFIG_MALLOC_BASE=0x87BFFF10 -CONFIG_MALLOC_SIZE=0x400000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_ARCH_HAS_LOWLEVEL_INIT=y CONFIG_PROMPT="OMAP3_EVM> " -CONFIG_BAUDRATE=115200 -CONFIG_SIMPLE_READLINE=y CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -# CONFIG_SHELL_HUSH is not set CONFIG_SHELL_SIMPLE=y -# CONFIG_CMDLINE_EDITING is not set # CONFIG_ERRNO_MESSAGES is not set # CONFIG_TIMESTAMP is not set -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set -# CONFIG_PARTITION is not set # CONFIG_DEFAULT_ENVIRONMENT is not set - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# -# CONFIG_CMD_EDIT is not set -# CONFIG_CMD_EXEC is not set -# CONFIG_CMD_SLEEP is not set -# CONFIG_CMD_SAVEENV is not set -# CONFIG_CMD_LOADENV is not set -# CONFIG_CMD_EXPORT is not set -# CONFIG_CMD_PRINTENV is not set -# CONFIG_CMD_READLINE is not set -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y # CONFIG_CMD_RM is not set # CONFIG_CMD_CAT is not set # CONFIG_CMD_MKDIR is not set # CONFIG_CMD_RMDIR is not set # CONFIG_CMD_CP is not set -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y # CONFIG_CMD_MOUNT is not set # CONFIG_CMD_UMOUNT is not set - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y - -# -# memory -# CONFIG_CMD_LOADB=y CONFIG_CMD_MEMINFO=y -# CONFIG_CMD_CRC is not set -# CONFIG_CMD_MTEST is not set - -# -# flash -# -# CONFIG_CMD_FLASH is not set - -# -# booting -# # CONFIG_CMD_BOOTM is not set -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y CONFIG_CMD_RESET=y CONFIG_CMD_GO=y -# CONFIG_CMD_TIMEOUT is not set -# CONFIG_CMD_PARTITION is not set -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y -# CONFIG_NET is not set - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y - -# -# SPI drivers -# # CONFIG_SPI is not set -# CONFIG_I2C is not set - -# -# flash drivers -# -# CONFIG_DRIVER_CFI is not set -CONFIG_DRIVER_CFI_OLD=y -# CONFIG_NAND is not set -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC16=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set diff --git a/arch/arm/configs/pca100_defconfig b/arch/arm/configs/pca100_defconfig index 5053bf655f..d1708a681e 100644 --- a/arch/arm/configs/pca100_defconfig +++ b/arch/arm/configs/pca100_defconfig @@ -1,131 +1,18 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2010.07.0 -# Tue Aug 3 08:28:20 2010 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_AT91RM9200 is not set -# CONFIG_ARCH_EP93XX is not set CONFIG_ARCH_IMX=y -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_S3C24xx is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_ARM926T=y -CONFIG_CPU_32v5=y - -# -# processor features -# -CONFIG_ARCH_TEXT_BASE=0xa7f00000 -CONFIG_BOARDINFO="Phytec phyCard-i.MX27" -CONFIG_ARCH_HAS_FEC_IMX=y - -# -# Freescale i.MX System-on-Chip -# -# CONFIG_ARCH_IMX1 is not set -# CONFIG_ARCH_IMX21 is not set -# CONFIG_ARCH_IMX25 is not set CONFIG_ARCH_IMX27=y -# CONFIG_ARCH_IMX31 is not set -# CONFIG_ARCH_IMX35 is not set -# CONFIG_MACH_EUKREA_CPUIMX27 is not set -# CONFIG_MACH_IMX27ADS is not set CONFIG_MACH_PCA100=y -# CONFIG_MACH_PCM038 is not set - -# -# Board specific settings -# - -# -# i.MX specific settings -# CONFIG_IMX_CLKO=y CONFIG_AEABI=y - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y -CONFIG_GENERIC_GPIO=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_MMU=y CONFIG_MMU=y -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y -CONFIG_TEXT_BASE=0xa7f00000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 CONFIG_MALLOC_SIZE=0x500000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="barebox:" -CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set CONFIG_GLOB=y -CONFIG_PROMPT_HUSH_PS2="> " CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_ENVIRONMENT_PATH="defaultenv arch/arm/boards/phycard-i.MX27/env" - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -133,124 +20,26 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y CONFIG_CMD_ECHO_E=y - -# -# memory -# -# CONFIG_CMD_LOADB is not set CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y CONFIG_CMD_MTEST=y -# CONFIG_CMD_MTEST_ALTERNATIVE is not set - -# -# flash -# CONFIG_CMD_FLASH=y - -# -# booting -# -CONFIG_CMD_BOOTM=y -# CONFIG_CMD_BOOTM_ZLIB is not set -# CONFIG_CMD_BOOTM_BZLIB is not set -# CONFIG_CMD_BOOTM_SHOW_TYPE is not set -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y -# CONFIG_CMD_LINUX16 is not set CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_CMD_GPIO=y -# CONFIG_CMD_UNLZO is not set CONFIG_NET=y CONFIG_NET_DHCP=y -# CONFIG_NET_NFS is not set CONFIG_NET_PING=y CONFIG_NET_TFTP=y CONFIG_NET_TFTP_PUSH=y CONFIG_NET_NETCONSOLE=y -# CONFIG_NET_RESOLV is not set - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set -CONFIG_DRIVER_SERIAL_IMX=y -# CONFIG_DRIVER_SERIAL_NS16550 is not set -CONFIG_MIIDEV=y - -# -# Network drivers -# -# CONFIG_DRIVER_NET_SMC911X is not set -# CONFIG_DRIVER_NET_SMC91111 is not set CONFIG_DRIVER_NET_FEC_IMX=y CONFIG_NET_USB=y CONFIG_NET_USB_ASIX=y - -# -# SPI drivers -# # CONFIG_SPI is not set -# CONFIG_I2C is not set - -# -# flash drivers -# -# CONFIG_DRIVER_CFI is not set -CONFIG_NAND=y -CONFIG_NAND_IMX=y -CONFIG_NAND_IMX_BOOT=y -# CONFIG_MTD_NAND_VERIFY_WRITE is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=y -# CONFIG_ATA is not set CONFIG_USB=y CONFIG_USB_EHCI=y -CONFIG_USB_ULPI=y CONFIG_USB_ISP1504=y -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set -CONFIG_PROCESS_ESCAPE_SEQUENCE=y diff --git a/arch/arm/configs/pcm037_defconfig b/arch/arm/configs/pcm037_defconfig index bfee2b2243..8e60b0a6c3 100644 --- a/arch/arm/configs/pcm037_defconfig +++ b/arch/arm/configs/pcm037_defconfig @@ -1,133 +1,16 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2010.07.0 -# Tue Aug 3 08:28:42 2010 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_AT91RM9200 is not set -# CONFIG_ARCH_EP93XX is not set CONFIG_ARCH_IMX=y -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_S3C24xx is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_V6=y -CONFIG_CPU_32v6=y - -# -# processor features -# -CONFIG_ARCH_HAS_L2X0=y CONFIG_CACHE_L2X0=y -CONFIG_ARCH_TEXT_BASE=0x87f00000 -CONFIG_BOARDINFO="Phytec phyCORE-i.MX31" - -# -# Freescale i.MX System-on-Chip -# -# CONFIG_ARCH_IMX1 is not set -# CONFIG_ARCH_IMX21 is not set -# CONFIG_ARCH_IMX25 is not set -# CONFIG_ARCH_IMX27 is not set CONFIG_ARCH_IMX31=y -# CONFIG_ARCH_IMX35 is not set -CONFIG_MACH_PCM037=y - -# -# Board specific settings -# -CONFIG_PCM037_SDRAM_BANK0_128MB=y -# CONFIG_PCM037_SDRAM_BANK0_256MB is not set -CONFIG_PCM037_SDRAM_BANK1_NONE=y -# CONFIG_PCM037_SDRAM_BANK1_128MB is not set -# CONFIG_PCM037_SDRAM_BANK1_256MB is not set - -# -# i.MX specific settings -# CONFIG_AEABI=y - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y -CONFIG_GENERIC_GPIO=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_MMU=y CONFIG_MMU=y -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y -CONFIG_TEXT_BASE=0x87f00000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 -CONFIG_MALLOC_SIZE=0x400000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="barebox:" -CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set CONFIG_GLOB=y -CONFIG_PROMPT_HUSH_PS2="> " CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_ENVIRONMENT_PATH="defaultenv arch/arm/boards/pcm037/env" - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -135,132 +18,25 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y CONFIG_CMD_ECHO_E=y - -# -# memory -# -# CONFIG_CMD_LOADB is not set CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y -# CONFIG_CMD_MTEST is not set - -# -# flash -# CONFIG_CMD_FLASH=y - -# -# booting -# -CONFIG_CMD_BOOTM=y -# CONFIG_CMD_BOOTM_ZLIB is not set -# CONFIG_CMD_BOOTM_BZLIB is not set -# CONFIG_CMD_BOOTM_SHOW_TYPE is not set -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y -# CONFIG_CMD_LINUX16 is not set CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_CMD_GPIO=y -# CONFIG_CMD_UNLZO is not set CONFIG_NET=y CONFIG_NET_DHCP=y -# CONFIG_NET_NFS is not set CONFIG_NET_PING=y CONFIG_NET_TFTP=y CONFIG_NET_TFTP_PUSH=y CONFIG_NET_NETCONSOLE=y -# CONFIG_NET_RESOLV is not set - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set -CONFIG_DRIVER_SERIAL_IMX=y -# CONFIG_DRIVER_SERIAL_NS16550 is not set -CONFIG_MIIDEV=y - -# -# Network drivers -# CONFIG_DRIVER_NET_SMC911X=y -CONFIG_DRIVER_NET_SMC911X_ADDRESS_SHIFT=0 -# CONFIG_DRIVER_NET_SMC91111 is not set CONFIG_NET_USB=y CONFIG_NET_USB_ASIX=y - -# -# SPI drivers -# -CONFIG_SPI=y -# CONFIG_DRIVER_SPI_IMX is not set -# CONFIG_DRIVER_SPI_MC13783 is not set -# CONFIG_I2C is not set - -# -# flash drivers -# CONFIG_DRIVER_CFI=y -CONFIG_DRIVER_CFI_INTEL=y -CONFIG_DRIVER_CFI_AMD=y -CONFIG_DRIVER_CFI_BANK_WIDTH_1=y -CONFIG_DRIVER_CFI_BANK_WIDTH_2=y -CONFIG_DRIVER_CFI_BANK_WIDTH_4=y -# CONFIG_DRIVER_CFI_BANK_WIDTH_8 is not set CONFIG_CFI_BUFFER_WRITE=y -CONFIG_NAND=y -CONFIG_NAND_IMX=y -CONFIG_NAND_IMX_BOOT=y -# CONFIG_MTD_NAND_VERIFY_WRITE is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=y -# CONFIG_ATA is not set CONFIG_USB=y CONFIG_USB_EHCI=y -CONFIG_USB_ULPI=y -CONFIG_USB_ISP1504=y -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set -CONFIG_PROCESS_ESCAPE_SEQUENCE=y diff --git a/arch/arm/configs/pcm038_defconfig b/arch/arm/configs/pcm038_defconfig index a2b31f2ec5..eacbbc6398 100644 --- a/arch/arm/configs/pcm038_defconfig +++ b/arch/arm/configs/pcm038_defconfig @@ -1,131 +1,19 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2010.07.0 -# Tue Aug 3 08:24:23 2010 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_AT91RM9200 is not set -# CONFIG_ARCH_EP93XX is not set CONFIG_ARCH_IMX=y -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_S3C24xx is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_ARM926T=y -CONFIG_CPU_32v5=y - -# -# processor features -# -CONFIG_ARCH_TEXT_BASE=0xa0000000 -CONFIG_BOARDINFO="Phytec phyCORE-i.MX27" -CONFIG_ARCH_HAS_FEC_IMX=y - -# -# Freescale i.MX System-on-Chip -# -# CONFIG_ARCH_IMX1 is not set -# CONFIG_ARCH_IMX21 is not set -# CONFIG_ARCH_IMX25 is not set CONFIG_ARCH_IMX27=y -# CONFIG_ARCH_IMX31 is not set -# CONFIG_ARCH_IMX35 is not set -# CONFIG_MACH_EUKREA_CPUIMX27 is not set -# CONFIG_MACH_IMX27ADS is not set -# CONFIG_MACH_PCA100 is not set CONFIG_MACH_PCM038=y - -# -# Board specific settings -# - -# -# i.MX specific settings -# CONFIG_IMX_CLKO=y CONFIG_AEABI=y - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y -CONFIG_GENERIC_GPIO=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_MMU=y CONFIG_MMU=y -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y CONFIG_TEXT_BASE=0xa7f00000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 CONFIG_MALLOC_SIZE=0x1000000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="barebox:" -CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set CONFIG_GLOB=y -CONFIG_PROMPT_HUSH_PS2="> " CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_ENVIRONMENT_PATH="defaultenv arch/arm/boards/pcm038/env" - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -133,137 +21,36 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y CONFIG_CMD_ECHO_E=y - -# -# memory -# -# CONFIG_CMD_LOADB is not set CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y CONFIG_CMD_MTEST=y -# CONFIG_CMD_MTEST_ALTERNATIVE is not set - -# -# flash -# CONFIG_CMD_FLASH=y - -# -# booting -# -CONFIG_CMD_BOOTM=y -# CONFIG_CMD_BOOTM_ZLIB is not set -# CONFIG_CMD_BOOTM_BZLIB is not set -# CONFIG_CMD_BOOTM_SHOW_TYPE is not set -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y -# CONFIG_CMD_LINUX16 is not set CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_CMD_BMP=y CONFIG_CMD_GPIO=y -# CONFIG_CMD_UNLZO is not set CONFIG_NET=y CONFIG_NET_DHCP=y -# CONFIG_NET_NFS is not set CONFIG_NET_PING=y CONFIG_NET_TFTP=y CONFIG_NET_TFTP_PUSH=y CONFIG_NET_NETCONSOLE=y -# CONFIG_NET_RESOLV is not set - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set -CONFIG_DRIVER_SERIAL_IMX=y -# CONFIG_DRIVER_SERIAL_NS16550 is not set -CONFIG_MIIDEV=y - -# -# Network drivers -# -# CONFIG_DRIVER_NET_SMC911X is not set -# CONFIG_DRIVER_NET_SMC91111 is not set CONFIG_DRIVER_NET_FEC_IMX=y CONFIG_NET_USB=y CONFIG_NET_USB_ASIX=y - -# -# SPI drivers -# -CONFIG_SPI=y -CONFIG_DRIVER_SPI_IMX=y -CONFIG_DRIVER_SPI_MC13783=y -# CONFIG_I2C is not set - -# -# flash drivers -# -CONFIG_HAS_CFI=y CONFIG_DRIVER_CFI=y -CONFIG_DRIVER_CFI_INTEL=y -CONFIG_DRIVER_CFI_AMD=y -CONFIG_DRIVER_CFI_BANK_WIDTH_1=y -CONFIG_DRIVER_CFI_BANK_WIDTH_2=y -CONFIG_DRIVER_CFI_BANK_WIDTH_4=y -# CONFIG_DRIVER_CFI_BANK_WIDTH_8 is not set CONFIG_CFI_BUFFER_WRITE=y +CONFIG_MTD=y CONFIG_NAND=y CONFIG_NAND_IMX=y CONFIG_NAND_IMX_BOOT=y -# CONFIG_MTD_NAND_VERIFY_WRITE is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=y -# CONFIG_ATA is not set +CONFIG_UBI=y CONFIG_USB=y CONFIG_USB_EHCI=y -CONFIG_USB_ULPI=y CONFIG_USB_ISP1504=y -# CONFIG_USB_GADGET is not set CONFIG_VIDEO=y CONFIG_DRIVER_VIDEO_IMX=y CONFIG_IMXFB_DRIVER_VIDEO_IMX_OVERLAY=y - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set -CONFIG_PROCESS_ESCAPE_SEQUENCE=y diff --git a/arch/arm/configs/pcm043_defconfig b/arch/arm/configs/pcm043_defconfig index b374c7cdd9..51ca83320b 100644 --- a/arch/arm/configs/pcm043_defconfig +++ b/arch/arm/configs/pcm043_defconfig @@ -1,135 +1,19 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2010.07.0 -# Tue Aug 3 09:10:56 2010 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_AT91RM9200 is not set -# CONFIG_ARCH_EP93XX is not set CONFIG_ARCH_IMX=y -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_S3C24xx is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_V6=y -CONFIG_CPU_32v6=y - -# -# processor features -# -CONFIG_ARCH_HAS_L2X0=y CONFIG_CACHE_L2X0=y -CONFIG_ARCH_TEXT_BASE=0x87f00000 -CONFIG_BOARDINFO="Phytec phyCORE-i.MX35" -CONFIG_ARCH_HAS_FEC_IMX=y -# CONFIG_ARCH_IMX_INTERNAL_BOOT is not set - -# -# Freescale i.MX System-on-Chip -# -# CONFIG_ARCH_IMX1 is not set -# CONFIG_ARCH_IMX21 is not set -# CONFIG_ARCH_IMX25 is not set -# CONFIG_ARCH_IMX27 is not set -# CONFIG_ARCH_IMX31 is not set CONFIG_ARCH_IMX35=y -# CONFIG_MACH_EUKREA_CPUIMX35 is not set -# CONFIG_MACH_FREESCALE_MX35_3STACK is not set CONFIG_MACH_PCM043=y - -# -# Board specific settings -# -CONFIG_PCM043_DISPLAY_SHARP=y -# CONFIG_PCM043_DISPLAY_TY090 is not set - -# -# i.MX specific settings -# CONFIG_IMX_CLKO=y CONFIG_AEABI=y - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y -CONFIG_GENERIC_GPIO=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_MMU=y CONFIG_MMU=y -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y CONFIG_TEXT_BASE=0x87F00000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 -CONFIG_MALLOC_SIZE=0x400000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="barebox:" -CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set CONFIG_GLOB=y -CONFIG_PROMPT_HUSH_PS2="> " CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_ENVIRONMENT_PATH="defaultenv arch/arm/boards/pcm043/env" - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -137,126 +21,26 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y -# CONFIG_CMD_ECHO_E is not set - -# -# memory -# -# CONFIG_CMD_LOADB is not set CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y -# CONFIG_CMD_MTEST is not set - -# -# flash -# CONFIG_CMD_FLASH=y - -# -# booting -# -CONFIG_CMD_BOOTM=y -# CONFIG_CMD_BOOTM_ZLIB is not set -# CONFIG_CMD_BOOTM_BZLIB is not set -# CONFIG_CMD_BOOTM_SHOW_TYPE is not set -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y -# CONFIG_CMD_LINUX16 is not set CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_CMD_GPIO=y -# CONFIG_CMD_UNLZO is not set CONFIG_NET=y CONFIG_NET_DHCP=y -# CONFIG_NET_NFS is not set CONFIG_NET_PING=y CONFIG_NET_TFTP=y CONFIG_NET_TFTP_PUSH=y CONFIG_NET_NETCONSOLE=y -# CONFIG_NET_RESOLV is not set - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set -CONFIG_DRIVER_SERIAL_IMX=y -# CONFIG_DRIVER_SERIAL_NS16550 is not set -CONFIG_MIIDEV=y - -# -# Network drivers -# -# CONFIG_DRIVER_NET_SMC911X is not set -# CONFIG_DRIVER_NET_SMC91111 is not set CONFIG_DRIVER_NET_FEC_IMX=y - -# -# SPI drivers -# # CONFIG_SPI is not set -# CONFIG_I2C is not set - -# -# flash drivers -# -CONFIG_HAS_CFI=y CONFIG_DRIVER_CFI=y -CONFIG_DRIVER_CFI_INTEL=y -CONFIG_DRIVER_CFI_AMD=y -CONFIG_DRIVER_CFI_BANK_WIDTH_1=y -CONFIG_DRIVER_CFI_BANK_WIDTH_2=y -CONFIG_DRIVER_CFI_BANK_WIDTH_4=y -# CONFIG_DRIVER_CFI_BANK_WIDTH_8 is not set CONFIG_CFI_BUFFER_WRITE=y +CONFIG_MTD=y CONFIG_NAND=y CONFIG_NAND_IMX=y CONFIG_NAND_IMX_BOOT=y -# CONFIG_MTD_NAND_VERIFY_WRITE is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=y -# CONFIG_ATA is not set -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set -CONFIG_PROCESS_ESCAPE_SEQUENCE=y +CONFIG_UBI=y diff --git a/arch/arm/configs/pm9263_defconfig b/arch/arm/configs/pm9263_defconfig index da7a8566b7..b76f201905 100644 --- a/arch/arm/configs/pm9263_defconfig +++ b/arch/arm/configs/pm9263_defconfig @@ -1,115 +1,13 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2.0.0-rc10 -# Fri Dec 18 11:50:15 2009 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -CONFIG_ARCH_AT91=y -# CONFIG_ARCH_AT91RM9200 is not set -# CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_S3C24xx is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_ARM926T=y -CONFIG_CPU_32v5=y - -# -# processor features -# -CONFIG_ARCH_TEXT_BASE=0x23f00000 -CONFIG_BOARDINFO="Ronetix PM9263" - -# -# Atmel AT91 System-on-Chip -# -# CONFIG_ARCH_AT91SAM9260 is not set CONFIG_ARCH_AT91SAM9263=y -# CONFIG_MACH_AT91SAM9263EK is not set -# CONFIG_MACH_MMCCPU is not set CONFIG_MACH_PM9263=y -# CONFIG_AEABI is not set - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y -CONFIG_CMDLINE_TAG=y -CONFIG_SETUP_MEMORY_TAGS=y -# CONFIG_INITRD_TAG is not set CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y -CONFIG_GENERIC_GPIO=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y -CONFIG_TEXT_BASE=0x23f00000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 -CONFIG_MALLOC_SIZE=0x400000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="barebox:" -CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set CONFIG_GLOB=y CONFIG_PROMPT_HUSH_PS2="y" CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/pm9263/env/" - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -117,119 +15,22 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y - -# -# memory -# -# CONFIG_CMD_LOADB is not set CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y CONFIG_CMD_MTEST=y CONFIG_CMD_MTEST_ALTERNATIVE=y - -# -# flash -# CONFIG_CMD_FLASH=y - -# -# booting -# -CONFIG_CMD_BOOTM=y -# CONFIG_CMD_BOOTM_ZLIB is not set -# CONFIG_CMD_BOOTM_BZLIB is not set CONFIG_CMD_BOOTM_SHOW_TYPE=y -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_CMD_GPIO=y CONFIG_NET=y CONFIG_NET_DHCP=y -# CONFIG_NET_RARP is not set -# CONFIG_NET_NFS is not set CONFIG_NET_PING=y CONFIG_NET_TFTP=y - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set -# CONFIG_DRIVER_SERIAL_NS16550 is not set -CONFIG_DRIVER_SERIAL_ATMEL=y -CONFIG_MIIDEV=y - -# -# Network drivers -# -# CONFIG_DRIVER_NET_SMC911X is not set -# CONFIG_DRIVER_NET_SMC91111 is not set CONFIG_DRIVER_NET_MACB=y - -# -# SPI drivers -# # CONFIG_SPI is not set -# CONFIG_I2C is not set - -# -# flash drivers -# CONFIG_DRIVER_CFI=y -CONFIG_DRIVER_CFI_NEW=y -CONFIG_DRIVER_CFI_INTEL=y -CONFIG_DRIVER_CFI_AMD=y -CONFIG_DRIVER_CFI_BANK_WIDTH_1=y -CONFIG_DRIVER_CFI_BANK_WIDTH_2=y -CONFIG_DRIVER_CFI_BANK_WIDTH_4=y -# CONFIG_DRIVER_CFI_BANK_WIDTH_8 is not set CONFIG_CFI_BUFFER_WRITE=y -CONFIG_NAND=y -CONFIG_NAND_ATMEL=y -# CONFIG_MTD_NAND_VERIFY_WRITE is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=y -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set diff --git a/arch/arm/configs/scb9328_defconfig b/arch/arm/configs/scb9328_defconfig index eaf7bd4936..49bdc0d64d 100644 --- a/arch/arm/configs/scb9328_defconfig +++ b/arch/arm/configs/scb9328_defconfig @@ -1,241 +1,22 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2.0.0-rc10 -# Fri Dec 18 11:50:25 2009 -# -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_ARM=y - -# -# System Type -# -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_AT91RM9200 is not set CONFIG_ARCH_IMX=y -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_S3C24xx is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_ARM920T=y -CONFIG_CPU_32v4T=y - -# -# processor features -# -CONFIG_ARCH_TEXT_BASE=0x08f80000 -CONFIG_BOARDINFO="Synertronixx scb9328" - -# -# Freescale i.MX System-on-Chip -# -CONFIG_ARCH_IMX1=y -# CONFIG_ARCH_IMX21 is not set -# CONFIG_ARCH_IMX25 is not set -# CONFIG_ARCH_IMX27 is not set -# CONFIG_ARCH_IMX31 is not set -# CONFIG_ARCH_IMX35 is not set -# CONFIG_MACH_MX1ADS is not set CONFIG_MACH_SCB9328=y - -# -# Board specific settings -# - -# -# i.MX specific settings -# -# CONFIG_AEABI is not set - -# -# Arm specific settings -# -CONFIG_CMD_ARM_CPUINFO=y -CONFIG_CMDLINE_TAG=y -CONFIG_SETUP_MEMORY_TAGS=y -# CONFIG_INITRD_TAG is not set CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_GENERIC_GPIO=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_MMU=y -# CONFIG_MMU is not set -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y -CONFIG_TEXT_BASE=0x08f80000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 -CONFIG_MALLOC_SIZE=0x400000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_MACH_HAS_LOWLEVEL_INIT=y -CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="barebox:" -CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set -# CONFIG_GLOB is not set -CONFIG_PROMPT_HUSH_PS2="> " CONFIG_CMDLINE_EDITING=y -# CONFIG_AUTO_COMPLETE is not set -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set -# CONFIG_PARTITION is not set -CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/scb9328/env" - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y -# CONFIG_CMD_SAVEENV is not set -# CONFIG_CMD_LOADENV is not set -# CONFIG_CMD_EXPORT is not set -# CONFIG_CMD_PRINTENV is not set -# CONFIG_CMD_READLINE is not set -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y - -# -# memory -# -# CONFIG_CMD_LOADB is not set CONFIG_CMD_MEMINFO=y -# CONFIG_CMD_CRC is not set -# CONFIG_CMD_MTEST is not set - -# -# flash -# CONFIG_CMD_FLASH=y - -# -# booting -# -CONFIG_CMD_BOOTM=y -# CONFIG_CMD_BOOTM_ZLIB is not set -# CONFIG_CMD_BOOTM_BZLIB is not set -# CONFIG_CMD_BOOTM_SHOW_TYPE is not set -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_BOOTU=y CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_CMD_GPIO=y CONFIG_NET=y CONFIG_NET_DHCP=y -# CONFIG_NET_RARP is not set -# CONFIG_NET_NFS is not set CONFIG_NET_PING=y CONFIG_NET_TFTP=y - -# -# Drivers -# - -# -# serial drivers -# -# CONFIG_DRIVER_SERIAL_ARM_DCC is not set -CONFIG_DRIVER_SERIAL_IMX=y -# CONFIG_DRIVER_SERIAL_NS16550 is not set -CONFIG_HAS_DM9000=y -CONFIG_MIIDEV=y - -# -# Network drivers -# -# CONFIG_DRIVER_NET_SMC911X is not set -# CONFIG_DRIVER_NET_SMC91111 is not set CONFIG_DRIVER_NET_DM9000=y - -# -# SPI drivers -# -CONFIG_SPI=y -# CONFIG_DRIVER_SPI_IMX is not set -# CONFIG_DRIVER_SPI_MC13783 is not set -# CONFIG_I2C is not set - -# -# flash drivers -# -CONFIG_HAS_CFI=y CONFIG_DRIVER_CFI=y -# CONFIG_DRIVER_CFI_NEW is not set -CONFIG_DRIVER_CFI_OLD=y CONFIG_CFI_BUFFER_WRITE=y -# CONFIG_NAND is not set -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set diff --git a/arch/arm/cpu/cache-armv4.S b/arch/arm/cpu/cache-armv4.S index 3cec4dd9af..fc53653c34 100644 --- a/arch/arm/cpu/cache-armv4.S +++ b/arch/arm/cpu/cache-armv4.S @@ -1,4 +1,5 @@ #include <linux/linkage.h> +#include <init.h> #define CACHE_DLINESIZE 32 @@ -41,7 +42,7 @@ ENTRY(__mmu_cache_off) mov pc, lr ENDPROC(__mmu_cache_off) -.section ".text_bare_init.text" +__BARE_INIT ENTRY(__mmu_cache_flush) mrc p15, 0, r6, c0, c0 @ get processor ID mov r2, #64*1024 @ default: 32K dcache size (*2) diff --git a/arch/arm/cpu/cache-armv5.S b/arch/arm/cpu/cache-armv5.S index 9fb320ff0c..d870e6b80f 100644 --- a/arch/arm/cpu/cache-armv5.S +++ b/arch/arm/cpu/cache-armv5.S @@ -1,4 +1,5 @@ #include <linux/linkage.h> +#include <init.h> #define CACHE_DLINESIZE 32 @@ -41,7 +42,7 @@ ENTRY(__mmu_cache_off) mov pc, lr ENDPROC(__mmu_cache_off) -.section ".text_bare_init.text" +__BARE_INIT ENTRY(__mmu_cache_flush) 1: mrc p15, 0, r15, c7, c14, 3 @ test,clean,invalidate D cache bne 1b diff --git a/arch/arm/cpu/cache-armv6.S b/arch/arm/cpu/cache-armv6.S index 25476d5a29..9de76da452 100644 --- a/arch/arm/cpu/cache-armv6.S +++ b/arch/arm/cpu/cache-armv6.S @@ -1,4 +1,5 @@ #include <linux/linkage.h> +#include <init.h> #define HARVARD_CACHE #define CACHE_LINE_SIZE 32 @@ -43,7 +44,7 @@ ENTRY(__mmu_cache_off) #endif mov pc, lr -.section ".text_bare_init.text" +__BARE_INIT ENTRY(__mmu_cache_flush) mov r1, #0 mcr p15, 0, r1, c7, c14, 0 @ clean+invalidate D diff --git a/arch/arm/cpu/cache-armv7.S b/arch/arm/cpu/cache-armv7.S index a303dc1285..79bc24358c 100644 --- a/arch/arm/cpu/cache-armv7.S +++ b/arch/arm/cpu/cache-armv7.S @@ -1,4 +1,5 @@ #include <linux/linkage.h> +#include <init.h> ENTRY(__mmu_cache_on) mov r12, lr @@ -49,7 +50,7 @@ ENTRY(__mmu_cache_off) mov pc, r12 ENDPROC(__mmu_cache_on) -.section ".text_bare_init.text" +__BARE_INIT ENTRY(__mmu_cache_flush) mrc p15, 0, r10, c0, c1, 5 @ read ID_MMFR1 tst r10, #0xf << 16 @ hierarchical cache (ARMv7) diff --git a/arch/arm/include/asm/.gitignore b/arch/arm/include/asm/.gitignore deleted file mode 100644 index 9cc4155c16..0000000000 --- a/arch/arm/include/asm/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/mach-types.h diff --git a/arch/arm/include/asm/clkdev.h b/arch/arm/include/asm/clkdev.h index b6ec7c627b..ad33945880 100644 --- a/arch/arm/include/asm/clkdev.h +++ b/arch/arm/include/asm/clkdev.h @@ -12,19 +12,6 @@ #ifndef __ASM_CLKDEV_H #define __ASM_CLKDEV_H -struct clk; - -struct clk_lookup { - struct list_head node; - const char *dev_id; - const char *con_id; - struct clk *clk; -}; - -struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id, - const char *dev_fmt, ...); - -void clkdev_add(struct clk_lookup *cl); -void clkdev_drop(struct clk_lookup *cl); +#include <mach/clkdev.h> #endif diff --git a/arch/arm/include/asm/posix_types.h b/arch/arm/include/asm/posix_types.h index c412486db5..aee050eeb8 100644 --- a/arch/arm/include/asm/posix_types.h +++ b/arch/arm/include/asm/posix_types.h @@ -19,7 +19,6 @@ * assume GCC is being used. */ -typedef unsigned short __kernel_dev_t; typedef unsigned long __kernel_ino_t; typedef unsigned short __kernel_mode_t; typedef unsigned short __kernel_nlink_t; diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c index 040fd346bf..7c2cbf95ea 100644 --- a/arch/arm/lib/armlinux.c +++ b/arch/arm/lib/armlinux.c @@ -212,7 +212,7 @@ int do_bootm_linux(struct image_data *data) void (*theKernel)(int zero, int arch, void *params); image_header_t *os_header = &data->os->header; - if (os_header->ih_type == IH_TYPE_MULTI) { + if (image_check_type(os_header, IH_TYPE_MULTI)) { printf("Multifile images not handled at the moment\n"); return -1; } @@ -227,14 +227,14 @@ int do_bootm_linux(struct image_data *data) return -1; } - theKernel = (void *)ntohl(os_header->ih_ep); + theKernel = (void *)image_get_ep(os_header); debug("## Transferring control to Linux (at address 0x%p) ...\n", theKernel); setup_tags(); - if (relocate_image(data->os, (void *)ntohl(os_header->ih_load))) + if (relocate_image(data->os, (void *)image_get_load(os_header))) return -1; /* we assume that the kernel is in place */ @@ -249,19 +249,29 @@ int do_bootm_linux(struct image_data *data) static int image_handle_cmdline_parse(struct image_data *data, int opt, char *optarg) { + int ret = 1; + switch (opt) { case 'a': armlinux_architecture = simple_strtoul(optarg, NULL, 0); - return 0; + ret = 0; + break; + case 'R': + system_rev = simple_strtoul(optarg, NULL, 0); + ret = 0; + break; default: - return 1; + break; } + + return ret; } static struct image_handler handler = { - .cmdline_options = "a:", + .cmdline_options = "a:R:", .cmdline_parse = image_handle_cmdline_parse, - .help_string = " -a <arch> use architecture number <arch>", + .help_string = " -a <arch> use architecture number <arch>\n" + " -R <system_rev> use system revison <system_rev>\n", .bootm = do_bootm_linux, .image_type = IH_OS_LINUX, diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 99d0f4dacb..1491161d6f 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -7,9 +7,13 @@ config ARCH_TEXT_BASE config BOARDINFO default "Atmel 91SAM9260-EK" if MACH_AT91SAM9260EK default "Atmel at91sam9263-ek" if MACH_AT91SAM9263EK + default "Atmel at91sam9g20-ek" if MACH_AT91SAM9G20EK default "Bucyrus MMC-CPU" if MACH_MMCCPU default "Ronetix PM9263" if MACH_PM9263 +config HAVE_NAND_ATMEL_BUSWIDTH_16 + bool + comment "Atmel AT91 System-on-Chip" choice @@ -23,7 +27,11 @@ config ARCH_AT91SAM9260 config ARCH_AT91SAM9263 bool "AT91SAM9263" select CPU_ARM926T - select MACH_HAS_LOWLEVEL_INIT + select HAS_MACB + +config ARCH_AT91SAM9G20 + bool "AT91SAM9G20" + select CPU_ARM926T select HAS_MACB endchoice @@ -38,6 +46,7 @@ choice config MACH_AT91SAM9260EK bool "Atmel AT91SAM9260-EK" + select HAVE_NAND_ATMEL_BUSWIDTH_16 help Say y here if you are using Atmel's AT91SAM9260-EK Evaluation board @@ -47,6 +56,25 @@ endif # ---------------------------------------------------------- +if ARCH_AT91SAM9G20 + +choice + + prompt "AT91SAM9G20 Board Type" + +config MACH_AT91SAM9G20EK + bool "Atmel AT91SAM9G20-EK Evaluation Kit" + select HAVE_NAND_ATMEL_BUSWIDTH_16 + help + Select this if you are using Atmel's AT91SAM9G20-EK Evaluation Kit + that embeds only one SD/MMC slot. + +endchoice + +endif + +# ---------------------------------------------------------- + if ARCH_AT91SAM9263 choice @@ -54,6 +82,8 @@ choice config MACH_AT91SAM9263EK bool "Atmel AT91SAM9263-EK" + select MACH_HAS_LOWLEVEL_INIT + select HAVE_NAND_ATMEL_BUSWIDTH_16 help Say y here if you are using Atmel's AT91SAM9263-EK Evaluation board @@ -64,6 +94,7 @@ config MACH_MMCCPU config MACH_PM9263 bool "Ronetix PM9263" + select MACH_HAS_LOWLEVEL_INIT help Say y here if you are using the Ronetix PM9263 Board @@ -71,4 +102,23 @@ endchoice endif +# ---------------------------------------------------------- + +comment "AT91 Board Options" + +config MTD_NAND_ATMEL_BUSWIDTH_16 + bool "Enable 16-bit data bus interface to NAND flash" + depends on HAVE_NAND_ATMEL_BUSWIDTH_16 + help + On AT91SAM926x boards both types of NAND flash can be present + (8 and 16 bit data bus width). + +config AT91_HAVE_2MMC + bool "Have 2 MMC" + depends on MACH_AT91SAM9G20EK + help + Select this if you are using an Atmel AT91SAM9G20-EK Evaluation Kit + with 2 SD/MMC Slots. This is the case for AT91SAM9G20-EK rev. C and + onwards. + endif diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 2878b0422e..1bedadbb66 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -5,3 +5,4 @@ obj-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += lowlevel_init.o # CPU-specific support obj-$(CONFIG_ARCH_AT91SAM9260) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263.o at91sam926x_time.o at91sam9263_devices.o sam9_smc.o +obj-$(CONFIG_ARCH_AT91SAM9G20) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index 398a721bf2..c6ddb13b54 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c @@ -26,6 +26,7 @@ static struct memory_platform_data sram_pdata = { }; static struct device_d sdram_dev = { + .id = -1, .name = "mem", .map_base = AT91_CHIPSELECT_1, .platform_data = &sram_pdata, @@ -40,6 +41,7 @@ void at91_add_device_sdram(u32 size) #if defined(CONFIG_DRIVER_NET_MACB) static struct device_d macb_dev = { + .id = -1, .name = "macb", .map_base = AT91SAM9260_BASE_EMAC, .size = 0x1000, @@ -82,6 +84,7 @@ void at91_add_device_eth(struct at91_ether_platform_data *data) {} #if defined(CONFIG_NAND_ATMEL) static struct device_d nand_dev = { + .id = -1, .name = "atmel_nand", .map_base = AT91_CHIPSELECT_3, .size = 0x10, @@ -117,6 +120,7 @@ void at91_add_device_nand(struct atmel_nand_data *data) {} #endif static struct device_d dbgu_serial_device = { + .id = -1, .name = "atmel_serial", .map_base = AT91_BASE_SYS + AT91_DBGU, .size = 4096, @@ -129,6 +133,7 @@ static inline void configure_dbgu_pins(void) } static struct device_d uart0_serial_device = { + .id = -1, .name = "atmel_serial", .map_base = AT91SAM9260_BASE_US0, .size = 4096, @@ -154,6 +159,7 @@ static inline void configure_usart0_pins(unsigned pins) } static struct device_d uart1_serial_device = { + .id = -1, .name = "atmel_serial", .map_base = AT91SAM9260_BASE_US1, .size = 4096, @@ -171,6 +177,7 @@ static inline void configure_usart1_pins(unsigned pins) } static struct device_d uart2_serial_device = { + .id = -1, .name = "atmel_serial", .map_base = AT91SAM9260_BASE_US2, .size = 4096, @@ -188,6 +195,7 @@ static inline void configure_usart2_pins(unsigned pins) } static struct device_d uart3_serial_device = { + .id = -1, .name = "atmel_serial", .map_base = AT91SAM9260_BASE_US3, .size = 4096, @@ -205,6 +213,7 @@ static inline void configure_usart3_pins(unsigned pins) } static struct device_d uart4_serial_device = { + .id = -1, .name = "atmel_serial", .map_base = AT91SAM9260_BASE_US4, .size = 4096, @@ -217,6 +226,7 @@ static inline void configure_usart4_pins(void) } static struct device_d uart5_serial_device = { + .id = -1, .name = "atmel_serial", .map_base = AT91SAM9260_BASE_US5, .size = 4096, diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c index 7ebc32ccee..807a6a769d 100644 --- a/arch/arm/mach-at91/at91sam9263_devices.c +++ b/arch/arm/mach-at91/at91sam9263_devices.c @@ -26,6 +26,7 @@ static struct memory_platform_data ram_pdata = { }; static struct device_d sdram_dev = { + .id = -1, .name = "mem", .map_base = AT91_CHIPSELECT_1, .platform_data = &ram_pdata, @@ -40,6 +41,7 @@ void at91_add_device_sdram(u32 size) #if defined(CONFIG_DRIVER_NET_MACB) static struct device_d macb_dev = { + .id = -1, .name = "macb", .map_base = AT91SAM9263_BASE_EMAC, .size = 0x1000, @@ -81,6 +83,7 @@ void at91_add_device_eth(struct at91_ether_platform_data *data) {} #if defined(CONFIG_NAND_ATMEL) static struct device_d nand_dev = { + .id = -1, .name = "atmel_nand", .map_base = AT91_CHIPSELECT_3, .size = 0x10, @@ -116,6 +119,7 @@ void at91_add_device_nand(struct atmel_nand_data *data) {} #endif static struct device_d dbgu_serial_device = { + .id = -1, .name = "atmel_serial", .map_base = (AT91_BASE_SYS + AT91_DBGU), .size = 4096, @@ -128,6 +132,7 @@ static inline void configure_dbgu_pins(void) } static struct device_d uart0_serial_device = { + .id = -1, .name = "atmel_serial", .map_base = AT91SAM9263_BASE_US0, .size = 4096, @@ -145,6 +150,7 @@ static inline void configure_usart0_pins(unsigned pins) } static struct device_d uart1_serial_device = { + .id = -1, .name = "atmel_serial", .map_base = AT91SAM9263_BASE_US1, .size = 4096, @@ -162,6 +168,7 @@ static inline void configure_usart1_pins(unsigned pins) } static struct device_d uart2_serial_device = { + .id = -1, .name = "atmel_serial", .map_base = AT91SAM9263_BASE_US2, .size = 4096, diff --git a/arch/arm/mach-at91/lowlevel_init.S b/arch/arm/mach-at91/lowlevel_init.S index 497cc0d301..8a0ae02a6a 100644 --- a/arch/arm/mach-at91/lowlevel_init.S +++ b/arch/arm/mach-at91/lowlevel_init.S @@ -193,7 +193,8 @@ SMRDATA: .word CONFIG_SYS_PIOD_PPUDR_VAL .word (AT91_BASE_SYS + AT91_PIOD + PIO_ASR) .word CONFIG_SYS_PIOD_PPUDR_VAL -#elif defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9261) +#elif defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9261) \ + || defined(CONFIG_ARCH_AT91SAM9G20) .word (AT91_BASE_SYS + AT91_PIOC + PIO_PDR) .word CONFIG_SYS_PIOC_PDR_VAL1 .word (AT91_BASE_SYS + AT91_PIOC + PIO_PUDR) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 24d2684b4a..8a4e1ee268 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -40,6 +40,28 @@ config ARCH_IMX_INTERNAL_BOOT bool "support internal boot mode" depends on ARCH_IMX25 || ARCH_IMX35 +choice + depends on ARCH_IMX_INTERNAL_BOOT + prompt "Internal boot source" + help + Determines the location of the header information for internal boot. + 0x100 for OneNAND + 0x400 for NAND, SD/MMC or Serial ROM + 0x1000 for NOR + +config ARCH_IMX_INTERNAL_BOOT_NAND + default y + bool "NAND, SD/MMC, Serial ROM" + select NAND_IMX_BOOT + +config ARCH_IMX_INTERNAL_BOOT_NOR + bool "NOR" + +config ARCH_IMX_INTERNAL_BOOT_ONENAND + bool "OneNAND" + +endchoice + comment "Freescale i.MX System-on-Chip" choice @@ -143,7 +165,7 @@ config MACH_FREESCALE_MX25_3STACK select HAS_CFI select MACH_HAS_LOWLEVEL_INIT select I2C - select DRIVER_I2C_MC34704 + select I2C_MC34704 help Say Y here if you are using the Freescale MX25 3stack board equipped with a Freescale i.MX25 Processor @@ -253,9 +275,9 @@ config MACH_FREESCALE_MX35_3STACK select HAS_CFI select MACH_HAS_LOWLEVEL_INIT select I2C - select DRIVER_I2C_IMX - select DRIVER_I2C_MC13892 - select DRIVER_I2C_MC9SDZ60 + select I2C_IMX + select I2C_MC13892 + select I2C_MC9SDZ60 help Say Y here if you are using the Freescale MX35 3stack board equipped with a Freescale i.MX35 Processor diff --git a/arch/arm/mach-imx/imx25.c b/arch/arm/mach-imx/imx25.c index b48f7481e8..37eafafe6e 100644 --- a/arch/arm/mach-imx/imx25.c +++ b/arch/arm/mach-imx/imx25.c @@ -54,6 +54,7 @@ static struct imx_iim_platform_data imx25_iim_pdata = { }; static struct device_d imx25_iim_dev = { + .id = -1, .name = "imx_iim", .map_base = IMX_IIM_BASE, .platform_data = &imx25_iim_pdata, diff --git a/arch/arm/mach-imx/include/mach/barebox.lds.h b/arch/arm/mach-imx/include/mach/barebox.lds.h index 8e1eccda5b..a2932bd79f 100644 --- a/arch/arm/mach-imx/include/mach/barebox.lds.h +++ b/arch/arm/mach-imx/include/mach/barebox.lds.h @@ -5,13 +5,13 @@ .pre_image : { \ KEEP(*(.flash_header_start*)) \ . = 0x100; \ - KEEP(*(.flash_header_0x100*)) \ - KEEP(*(.dcd_entry_0x100*)) \ - KEEP(*(.image_len_0x100*)) \ + KEEP(*(.flash_header_0x0100*)) \ + KEEP(*(.dcd_entry_0x0100*)) \ + KEEP(*(.image_len_0x0100*)) \ . = 0x400; \ - KEEP(*(.flash_header_0x400*)) \ - KEEP(*(.dcd_entry_0x400*)) \ - KEEP(*(.image_len_0x400*)) \ + KEEP(*(.flash_header_0x0400*)) \ + KEEP(*(.dcd_entry_0x0400*)) \ + KEEP(*(.image_len_0x0400*)) \ . = 0x1000; \ KEEP(*(.flash_header_0x1000*)) \ KEEP(*(.dcd_entry_0x1000*)) \ diff --git a/arch/arm/mach-imx/include/mach/imx-flash-header.h b/arch/arm/mach-imx/include/mach/imx-flash-header.h index 831a3aa1e3..f1054da08f 100644 --- a/arch/arm/mach-imx/include/mach/imx-flash-header.h +++ b/arch/arm/mach-imx/include/mach/imx-flash-header.h @@ -3,17 +3,33 @@ #define __flash_header_start __section(.flash_header_start) -#define __flash_header_0x100 __section(.flash_header_0x100) -#define __dcd_entry_0x100 __section(.dcd_entry_0x100) -#define __image_len_0x100 __section(.image_len_0x100) +#if defined(CONFIG_ARCH_IMX_INTERNAL_BOOT_NOR) + #define __flash_header_section __section(.flash_header_0x1000) + #define __dcd_entry_section __section(.dcd_entry_0x1000) + #define __image_len_section __section(.image_len_0x1000) + #define FLASH_HEADER_OFFSET 0x1000 +#elif defined(CONFIG_ARCH_IMX_INTERNAL_BOOT_ONENAND) + #define __flash_header_section __section(.flash_header_0x0100) + #define __dcd_entry_section __section(.dcd_entry_0x0100) + #define __image_len_section __section(.image_len_0x0100) + #define FLASH_HEADER_OFFSET 0x0100 +#else + #define __flash_header_section __section(.flash_header_0x0400) + #define __dcd_entry_section __section(.dcd_entry_0x0400) + #define __image_len_section __section(.image_len_0x0400) + #define FLASH_HEADER_OFFSET 0x0400 +#endif -#define __flash_header_0x400 __section(.flash_header_0x400) -#define __dcd_entry_0x400 __section(.dcd_entry_0x400) -#define __image_len_0x400 __section(.image_len_0x400) +/* + * NOR is not automatically copied anywhere by the boot ROM + */ +#if defined (CONFIG_ARCH_IMX_INTERNAL_BOOT_NOR) + #define DEST_BASE IMX_CS0_BASE +#else + #define DEST_BASE TEXT_BASE +#endif -#define __flash_header_0x1000 __section(.flash_header_0x1000) -#define __dcd_entry_0x1000 __section(.dcd_entry_0x1000) -#define __image_len_0x1000 __section(.image_len_0x1000) +#define FLASH_HEADER_BASE (DEST_BASE + FLASH_HEADER_OFFSET) struct imx_dcd_entry { unsigned long ptr_type; diff --git a/arch/arm/mach-imx/include/mach/imx27-regs.h b/arch/arm/mach-imx/include/mach/imx27-regs.h index 8d0bcda726..f4354ba9b7 100644 --- a/arch/arm/mach-imx/include/mach/imx27-regs.h +++ b/arch/arm/mach-imx/include/mach/imx27-regs.h @@ -83,9 +83,9 @@ #include "esdctl.h" /* Watchdog Registers*/ -#define WCR __REG(IMX_WDT_BASE + 0x00) /* Watchdog Control Register */ -#define WSR __REG(IMX_WDT_BASE + 0x04) /* Watchdog Service Register */ -#define WSTR __REG(IMX_WDT_BASE + 0x08) /* Watchdog Status Register */ +#define WCR __REG16(IMX_WDT_BASE + 0x00) /* Watchdog Control Register */ +#define WSR __REG16(IMX_WDT_BASE + 0x02) /* Watchdog Service Register */ +#define WSTR __REG16(IMX_WDT_BASE + 0x04) /* Watchdog Status Register */ /* important definition of some bits of WCR */ #define WCR_WDE 0x04 diff --git a/arch/arm/mach-imx/include/mach/imx35-regs.h b/arch/arm/mach-imx/include/mach/imx35-regs.h index c394a2af88..5cfb788c5b 100644 --- a/arch/arm/mach-imx/include/mach/imx35-regs.h +++ b/arch/arm/mach-imx/include/mach/imx35-regs.h @@ -46,6 +46,11 @@ #define IMX_NFC_BASE 0xBB000000 #define IMX_FEC_BASE 0x50038000 #define IMX_I2C1_BASE 0x43F80000 +#define IMX_I2C2_BASE 0x43F98000 +#define IMX_I2C3_BASE 0x43F84000 +#define IMX_SDHC1_BASE 0x53FB4000 +#define IMX_SDHC2_BASE 0x53FB8000 +#define IMX_SDHC3_BASE 0x53FBC000 /* * Clock Controller Module (CCM) diff --git a/arch/arm/mach-nomadik/8815.c b/arch/arm/mach-nomadik/8815.c index 8598f14efa..5844c68d0b 100644 --- a/arch/arm/mach-nomadik/8815.c +++ b/arch/arm/mach-nomadik/8815.c @@ -23,7 +23,7 @@ #include <asm/hardware.h> #include <mach/hardware.h> #include <asm/armlinux.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include "clock.h" @@ -37,6 +37,7 @@ static struct memory_platform_data ram_pdata = { }; static struct device_d sdram_dev = { + .id = -1, .name = "mem", .map_base = 0x00000000, .platform_data = &ram_pdata, @@ -50,12 +51,14 @@ void st8815_add_device_sdram(u32 size) } static struct device_d uart0_serial_device = { + .id = 0, .name = "uart-pl011", .map_base = NOMADIK_UART0_BASE, .size = 4096, }; static struct device_d uart1_serial_device = { + .id = 1, .name = "uart-pl011", .map_base = NOMADIK_UART1_BASE, .size = 4096, @@ -65,11 +68,11 @@ void st8815_register_uart(unsigned id) { switch (id) { case 0: - nmdk_clk_create(&st8815_clk_48, uart0_serial_device.name); + nmdk_clk_create(&st8815_clk_48, dev_name(&uart0_serial_device)); register_device(&uart0_serial_device); break; case 1: - nmdk_clk_create(&st8815_clk_48, uart1_serial_device.name); + nmdk_clk_create(&st8815_clk_48, dev_name(&uart1_serial_device)); register_device(&uart1_serial_device); break; } diff --git a/arch/arm/mach-nomadik/Kconfig b/arch/arm/mach-nomadik/Kconfig index 64894c8f5e..3d6eab6822 100644 --- a/arch/arm/mach-nomadik/Kconfig +++ b/arch/arm/mach-nomadik/Kconfig @@ -13,7 +13,7 @@ choice config MACH_NOMADIK_8815NHK bool "ST 8815 Nomadik Hardware Kit (evaluation board)" select NOMADIK_8815 - select COMMON_CLKDEV + select CLKDEV_LOOKUP endchoice diff --git a/arch/arm/mach-nomadik/clock.c b/arch/arm/mach-nomadik/clock.c index c74e0c131a..5f34a2cd9b 100644 --- a/arch/arm/mach-nomadik/clock.c +++ b/arch/arm/mach-nomadik/clock.c @@ -8,7 +8,7 @@ #include <linux/err.h> #include <linux/clk.h> #include <init.h> -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include "clock.h" @@ -34,11 +34,6 @@ void clk_disable(struct clk *clk) } EXPORT_SYMBOL(clk_disable); -int __clk_get(struct clk *clk) -{ - return 1; -} - /* Create a clock structure with the given name */ int nmdk_clk_create(struct clk *clk, const char *dev_id) { diff --git a/arch/arm/tools/Makefile b/arch/arm/tools/Makefile index 5243a98906..635cb1865e 100644 --- a/arch/arm/tools/Makefile +++ b/arch/arm/tools/Makefile @@ -4,7 +4,7 @@ # Copyright (C) 2001 Russell King # -arch/arm/include/asm/mach-types.h: $(src)/gen-mach-types $(src)/mach-types +include/generated/mach-types.h: $(src)/gen-mach-types $(src)/mach-types @echo ' Generating $@' @mkdir -p $(dir $@) $(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; } diff --git a/arch/arm/tools/gen-mach-types b/arch/arm/tools/gen-mach-types index ce319ef64b..04fef71d7b 100644 --- a/arch/arm/tools/gen-mach-types +++ b/arch/arm/tools/gen-mach-types @@ -1,6 +1,6 @@ #!/bin/awk # -# Awk script to generate include/asm-arm/mach-types.h +# Awk script to generate include/generated/mach-types.h # BEGIN { nr = 0 } /^#/ { next } diff --git a/arch/blackfin/boards/ipe337/ipe337.c b/arch/blackfin/boards/ipe337/ipe337.c index 269e7743fc..61bcd434f1 100644 --- a/arch/blackfin/boards/ipe337/ipe337.c +++ b/arch/blackfin/boards/ipe337/ipe337.c @@ -6,6 +6,7 @@ #include <fs.h> static struct device_d cfi_dev = { + .id = -1, .name = "cfi_flash", .map_base = 0x20000000, .size = 32 * 1024 * 1024, @@ -17,6 +18,7 @@ static struct memory_platform_data ram_pdata = { }; static struct device_d sdram_dev = { + .id = -1, .name = "mem", .map_base = 0x0, .size = 128 * 1024 * 1024, @@ -24,6 +26,7 @@ static struct device_d sdram_dev = { }; static struct device_d smc911x_dev = { + .id = -1, .name = "smc911x", .map_base = 0x24000000, .size = 4096, @@ -52,6 +55,7 @@ static int ipe337_devices_init(void) { device_initcall(ipe337_devices_init); static struct device_d blackfin_serial_device = { + .id = -1, .name = "blackfin_serial", .map_base = 0, .size = 4096, diff --git a/arch/blackfin/configs/ipe337_defconfig b/arch/blackfin/configs/ipe337_defconfig index e5667dc5c9..ffd144c61e 100644 --- a/arch/blackfin/configs/ipe337_defconfig +++ b/arch/blackfin/configs/ipe337_defconfig @@ -1,77 +1,8 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2.0.0-rc10 -# Fri Dec 18 11:53:16 2009 -# -CONFIG_BLACKFIN=y -CONFIG_BF561=y -CONFIG_BOARDINFO="PII IPE337" -CONFIG_ARCH_TEXT_BASE=0x00000000 -CONFIG_MACH_IPE337=y -# CONFIG_MACH_IPE337_V1 is not set -CONFIG_MACH_IPE337_V2=y -# CONFIG_BFIN_BOOT_BYPASS is not set -# CONFIG_BFIN_BOOT_FLASH8 is not set -CONFIG_BFIN_BOOT_FLASH16=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y CONFIG_TEXT_BASE=0x03f00000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 -CONFIG_MALLOC_SIZE=0x400000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_PROMPT="barebox:" -CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set -# CONFIG_GLOB is not set -CONFIG_PROMPT_HUSH_PS2="> " CONFIG_CMDLINE_EDITING=y -# CONFIG_AUTO_COMPLETE is not set -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT=y -CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/blackin/boards/ipe337/env" - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# +CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/blackfin/boards/ipe337/env" CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -79,107 +10,19 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y - -# -# memory -# -# CONFIG_CMD_LOADB is not set CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y -# CONFIG_CMD_MTEST is not set - -# -# flash -# CONFIG_CMD_FLASH=y - -# -# booting -# -CONFIG_CMD_BOOTM=y CONFIG_CMD_BOOTM_ZLIB=y -# CONFIG_CMD_BOOTM_BZLIB is not set CONFIG_CMD_BOOTM_SHOW_TYPE=y CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_NET=y CONFIG_NET_DHCP=y -# CONFIG_NET_RARP is not set -# CONFIG_NET_NFS is not set CONFIG_NET_PING=y CONFIG_NET_TFTP=y - -# -# Drivers -# - -# -# serial drivers -# -CONFIG_DRIVER_SERIAL_BLACKFIN=y -# CONFIG_DRIVER_SERIAL_NS16550 is not set -CONFIG_MIIDEV=y - -# -# Network drivers -# CONFIG_DRIVER_NET_SMC911X=y -CONFIG_DRIVER_NET_SMC911X_ADDRESS_SHIFT=1 -# CONFIG_DRIVER_NET_SMC91111 is not set - -# -# SPI drivers -# -CONFIG_SPI=y -# CONFIG_DRIVER_SPI_MC13783 is not set -# CONFIG_I2C is not set - -# -# flash drivers -# CONFIG_DRIVER_CFI=y -# CONFIG_DRIVER_CFI_NEW is not set -CONFIG_DRIVER_CFI_OLD=y CONFIG_CFI_BUFFER_WRITE=y -# CONFIG_NAND is not set -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_ZLIB=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set diff --git a/arch/blackfin/include/asm/posix_types.h b/arch/blackfin/include/asm/posix_types.h index 98397ca5f7..bbf6e9c374 100644 --- a/arch/blackfin/include/asm/posix_types.h +++ b/arch/blackfin/include/asm/posix_types.h @@ -34,7 +34,6 @@ * assume GCC is being used. */ -typedef unsigned short __kernel_dev_t; typedef unsigned long __kernel_ino_t; typedef unsigned short __kernel_mode_t; typedef unsigned short __kernel_nlink_t; diff --git a/arch/blackfin/lib/blackfin_linux.c b/arch/blackfin/lib/blackfin_linux.c index ce5f3a54c2..eda3f4c011 100644 --- a/arch/blackfin/lib/blackfin_linux.c +++ b/arch/blackfin/lib/blackfin_linux.c @@ -47,10 +47,10 @@ static int do_bootm_linux(struct image_data *idata) struct image_handle *os_handle = idata->os; image_header_t *os_header = &os_handle->header; - appl = (int (*)(char *))ntohl(os_header->ih_ep); + appl = (int (*)(char *))image_get_ep(os_header); printf("Starting Kernel at 0x%08x\n", appl); - if (relocate_image(os_handle, (void *)ntohl(os_header->ih_load))) + if (relocate_image(os_handle, (void *)image_get_load(os_header))) return -1; icache_disable(); diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index ec70028a16..86afb24732 100644 --- a/arch/m68k/Makefile +++ b/arch/m68k/Makefile @@ -18,8 +18,7 @@ # along with barebox. If not, see <http://www.gnu.org/licenses/>. # -CPPFLAGS += -isystem $(gccincdir) -D __M68K__ \ - -fno-strict-aliasing +CPPFLAGS += -isystem $(gccincdir) -fno-strict-aliasing machine-$(CONFIG_ARCH_MCF54xx) := mcfv4e diff --git a/arch/m68k/boards/kp_ukd_r1_num/kp_ukd_r1_num.c b/arch/m68k/boards/kp_ukd_r1_num/kp_ukd_r1_num.c index 9bf1713cc4..7475ab326b 100644 --- a/arch/m68k/boards/kp_ukd_r1_num/kp_ukd_r1_num.c +++ b/arch/m68k/boards/kp_ukd_r1_num/kp_ukd_r1_num.c @@ -42,6 +42,7 @@ ulong mcfv4e_get_bus_clk(void) * CS line 0, data width is 32 bit */ static struct device_d cfi_dev = { + .id = -1, .name = "cfi_flash", .map_base = CFG_FLASH_ADDRESS, .size = CFG_FLASH_SIZE, @@ -52,6 +53,7 @@ static struct device_d cfi_dev = { * to CS4, data width is 16 bit */ //static struct device_d sram_dev = { +// .id = -1, // .name = "sram", //FIXME .map_base = IMX_CS4_BASE, //FIXME .size = IMX_CS4_RANGE, /* area size */ @@ -61,6 +63,7 @@ static struct device_d cfi_dev = { * ?MiB NAND type flash, data width 8 bit */ //static struct device_d nand_dev = { +// .id = -1, // .name = "cfi_flash_nand", // .map_base = 0xfc000000, /* FIXME */ // .size = 32 * 1024 * 1024, /* FIXME */ @@ -75,12 +78,14 @@ static struct fec_platform_data fec_info = { }; static struct device_d network_dev0 = { + .id = -1, .name = "fec_mcf54xx", .map_base = MCF_FEC_ADDR(0), .size = MCF_FEC_SIZE(0), /* area size */ .platform_data = &fec_info, }; static struct device_d network_dev1 = { + .id = -1, .name = "fec_mcf54xx", .map_base = MCF_FEC_ADDR(1), .size = MCF_FEC_SIZE(1), /* area size */ @@ -96,6 +101,7 @@ static struct memory_platform_data ram_pdata = { }; static struct device_d sdram_dev = { + .id = -1, .name = "mem", .map_base = CFG_SDRAM_ADDRESS, .size = CFG_SDRAM_SIZE, @@ -134,6 +140,7 @@ static int mcfv4e_devices_init(void) device_initcall(mcfv4e_devices_init); static struct device_d mcfv4e_serial_device = { + .id = -1, .name = "mcfv4e_serial", .map_base = 1+CFG_EARLY_UART_PORT, .size = 16 * 1024, diff --git a/arch/m68k/boards/phycore_mcf54xx/phyCore_MCF54xx.c b/arch/m68k/boards/phycore_mcf54xx/phyCore_MCF54xx.c index 3bc2d12a42..3744950699 100644 --- a/arch/m68k/boards/phycore_mcf54xx/phyCore_MCF54xx.c +++ b/arch/m68k/boards/phycore_mcf54xx/phyCore_MCF54xx.c @@ -46,6 +46,7 @@ ulong mcfv4e_get_bus_clk(void) */ static struct device_d cfi_dev = { + .id = -1, .name = "cfi_flash", .map_base = CFG_FLASH_ADDRESS, .size = CFG_FLASH_SIZE, @@ -61,6 +62,7 @@ static struct fec_platform_data fec_info = static struct device_d network_dev0 = { + .id = -1, .name = "fec_mcf54xx", .map_base = MCF_FEC_ADDR(0), .size = MCF_FEC_SIZE(0), /* area size */ @@ -68,6 +70,7 @@ static struct device_d network_dev0 = }; static struct device_d network_dev1 = { + .id = -1, .name = "fec_mcf54xx", .map_base = MCF_FEC_ADDR(1), .size = MCF_FEC_SIZE(1), /* area size */ @@ -84,6 +87,7 @@ static struct memory_platform_data ram_pdata = { static struct device_d sdram_dev = { + .id = -1, .name = "mem", .map_base = CFG_SDRAM_ADDRESS, .size = CFG_SDRAM_SIZE, @@ -116,6 +120,7 @@ device_initcall(mcfv4e_devices_init); static struct device_d mcfv4e_serial_device = { + .id = -1, .name = "mcfv4e_serial", .map_base = 1 + CFG_EARLY_UART_PORT, .size = 16 * 1024, diff --git a/arch/m68k/configs/phycore_kpukdr1_5475num_defconfig b/arch/m68k/configs/phycore_kpukdr1_5475num_defconfig index d8688080e7..14c6d78f9f 100644 --- a/arch/m68k/configs/phycore_kpukdr1_5475num_defconfig +++ b/arch/m68k/configs/phycore_kpukdr1_5475num_defconfig @@ -1,143 +1,25 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.0.0-rc4-git -# Tue Feb 19 13:41:25 2008 -# -CONFIG_BOARDINFO="konzeptpark UKD Prototype with Phycore MCF5475 NUM" -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_M68K=y -CONFIG_MCFV4E=y -CONFIG_ARCH_MCF54xx=y -# CONFIG_MACH_KPUKDR1 is not set CONFIG_MACH_KPUKDR1_NUM=y -# CONFIG_MACH_KPUKDR2 is not set -# CONFIG_MACH_KPUKDR2_NUM is not set -# CONFIG_MACH_PCM982_5485 is not set -# CONFIG_MACH_PCM982_5475 is not set -# CONFIG_MACH_PCM982_5475_NUM is not set -# CONFIG_MACH_PCM982_54455 is not set - -# -# M68k/Coldfire V4E specific settings -# -CONFIG_COPY_LOWMEM_VECTORS=y -# CONFIG_USE_LOWMEM_VECTORS is not set -CONFIG_CMD_REGDUMP_V4E=y -CONFIG_CMD_PCI_V4E=y - -# -# M68k/Coldfire specific Linux boot settings -# -CONFIG_CMDLINE_TAG=y -CONFIG_SETUP_MEMORY_TAGS=y CONFIG_INITRD_TAG=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y - -# -# General Settings -# -CONFIG_TEXT_BASE=0x07f00000 CONFIG_BROKEN=y CONFIG_EXPERIMENTAL=y -# CONFIG_MODULES is not set -# CONFIG_KALLSYMS is not set -CONFIG_HAS_EARLY_INIT=y -CONFIG_EARLY_INITDATA_RAM_ADDR=0x20000000 -CONFIG_EARLY_INITDATA_RAM_SIZE=0x1f00 -CONFIG_EARLY_INITDATA_SIZE=0x100 -CONFIG_DEBUG_INITCALLS=y -CONFIG_USE_IRQ=y -CONFIG_PROMPT="barebox:" -CONFIG_BAUDRATE=115200 +CONFIG_LONGHELP=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set -# CONFIG_GLOB is not set -CONFIG_PROMPT_HUSH_PS2="> " -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -CONFIG_EARLY_CONSOLE_PORT="psc0" -CONFIG_EARLY_CONSOLE_BAUDRATE=115200 -# CONFIG_OF_FLAT_TREE is not set -CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/m68k/boards/kp_ukd_r1_num/env/" - -# -# Debugging -# CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_LL=y -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set CONFIG_ENABLE_DEVICE_NOISE=y - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y -CONFIG_CMD_HELP=y CONFIG_CMD_READLINE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y -# CONFIG_CMD_SPLASH is not set - -# -# memory -# -# CONFIG_CMD_LOADB is not set -# CONFIG_CMD_LOADS is not set CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y CONFIG_CMD_MTEST=y CONFIG_CMD_MTEST_ALTERNATIVE=y - -# -# flash -# CONFIG_CMD_FLASH=y - -# -# booting -# -CONFIG_CMD_BOOTM=y CONFIG_CMD_BOOTM_ZLIB=y CONFIG_CMD_BOOTM_BZLIB=y CONFIG_CMD_BOOTM_SHOW_TYPE=y @@ -145,52 +27,10 @@ CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y CONFIG_NET=y -CONFIG_NET_BOOTP=y CONFIG_NET_DHCP=y -CONFIG_NET_RARP=y -# CONFIG_NET_SNTP is not set -# CONFIG_NET_NFS is not set CONFIG_NET_PING=y CONFIG_NET_TFTP=y - -# -# Drivers -# - -# -# serial drivers -# -CONFIG_DRIVER_SERIAL_MCFV4E=y -CONFIG_MIIDEV=y - -# -# Network drivers -# -CONFIG_DRIVER_NET_MCF54XX=y -# CONFIG_DRIVER_NET_MCF54XX_DEBUG is not set - -# -# SPI drivers -# -CONFIG_SPI=y -# CONFIG_DRIVER_SPI_MC13783 is not set - -# -# flash drivers -# -CONFIG_HAS_CFI=y CONFIG_DRIVER_CFI=y -# CONFIG_DRIVER_CFI_NEW is not set -CONFIG_DRIVER_CFI_OLD=y CONFIG_CFI_BUFFER_WRITE=y -# CONFIG_NAND is not set - -# -# Filesystem support -# CONFIG_FS_CRAMFS=y -CONFIG_ZLIB=y -CONFIG_BZLIB=y -CONFIG_CRC32=y diff --git a/arch/m68k/configs/phycore_mcf54xx_defconfig b/arch/m68k/configs/phycore_mcf54xx_defconfig index ca3387a528..f0d9fc2845 100644 --- a/arch/m68k/configs/phycore_mcf54xx_defconfig +++ b/arch/m68k/configs/phycore_mcf54xx_defconfig @@ -1,143 +1,25 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.0.1-csc -# Thu Mar 27 14:02:15 2008 -# -CONFIG_BOARDINFO="Phytec Baseboard with Phycore MCF5485" -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_M68K=y -CONFIG_MCFV4E=y -CONFIG_ARCH_MCF54xx=y -# CONFIG_MACH_KPUKDR1 is not set -# CONFIG_MACH_KPUKDR1_NUM is not set -# CONFIG_MACH_KPUKDR2 is not set -# CONFIG_MACH_KPUKDR2_NUM is not set CONFIG_MACH_PCM982_5485=y -# CONFIG_MACH_PCM982_5475 is not set -# CONFIG_MACH_PCM982_5475_NUM is not set -# CONFIG_MACH_PCM982_54455 is not set - -# -# M68k/Coldfire V4E specific settings -# -CONFIG_COPY_LOWMEM_VECTORS=y -# CONFIG_USE_LOWMEM_VECTORS is not set -CONFIG_CMD_REGDUMP_V4E=y -CONFIG_CMD_PCI_V4E=y - -# -# M68k/Coldfire specific Linux boot settings -# -CONFIG_CMDLINE_TAG=y -CONFIG_SETUP_MEMORY_TAGS=y CONFIG_INITRD_TAG=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y - -# -# General Settings -# -CONFIG_TEXT_BASE=0x07f00000 CONFIG_BROKEN=y CONFIG_EXPERIMENTAL=y -# CONFIG_MODULES is not set -# CONFIG_KALLSYMS is not set -CONFIG_HAS_EARLY_INIT=y -CONFIG_EARLY_INITDATA_RAM_ADDR=0x20000000 -CONFIG_EARLY_INITDATA_RAM_SIZE=0x1f00 -CONFIG_EARLY_INITDATA_SIZE=0x100 -CONFIG_DEBUG_INITCALLS=y -CONFIG_USE_IRQ=y -CONFIG_PROMPT="barebox:" -CONFIG_BAUDRATE=115200 +CONFIG_LONGHELP=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set -# CONFIG_GLOB is not set -CONFIG_PROMPT_HUSH_PS2="> " -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -CONFIG_EARLY_CONSOLE_PORT="psc0" -CONFIG_EARLY_CONSOLE_BAUDRATE=115200 -# CONFIG_OF_FLAT_TREE is not set -CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/m68k/boards/phycore_mcf54xx/env" - -# -# Debugging -# CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_LL=y -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set CONFIG_ENABLE_DEVICE_NOISE=y - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y -CONFIG_CMD_HELP=y CONFIG_CMD_READLINE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y -# CONFIG_CMD_SPLASH is not set - -# -# memory -# -# CONFIG_CMD_LOADB is not set -# CONFIG_CMD_LOADS is not set CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y CONFIG_CMD_MTEST=y CONFIG_CMD_MTEST_ALTERNATIVE=y - -# -# flash -# CONFIG_CMD_FLASH=y - -# -# booting -# -CONFIG_CMD_BOOTM=y CONFIG_CMD_BOOTM_ZLIB=y CONFIG_CMD_BOOTM_BZLIB=y CONFIG_CMD_BOOTM_SHOW_TYPE=y @@ -145,52 +27,10 @@ CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y CONFIG_NET=y -CONFIG_NET_BOOTP=y CONFIG_NET_DHCP=y -CONFIG_NET_RARP=y -# CONFIG_NET_SNTP is not set -# CONFIG_NET_NFS is not set CONFIG_NET_PING=y CONFIG_NET_TFTP=y - -# -# Drivers -# - -# -# serial drivers -# -CONFIG_DRIVER_SERIAL_MCFV4E=y -CONFIG_MIIDEV=y - -# -# Network drivers -# -CONFIG_DRIVER_NET_MCF54XX=y -# CONFIG_DRIVER_NET_MCF54XX_DEBUG is not set - -# -# SPI drivers -# -CONFIG_SPI=y -# CONFIG_DRIVER_SPI_MC13783 is not set - -# -# flash drivers -# -CONFIG_HAS_CFI=y CONFIG_DRIVER_CFI=y -# CONFIG_DRIVER_CFI_NEW is not set -CONFIG_DRIVER_CFI_OLD=y CONFIG_CFI_BUFFER_WRITE=y -# CONFIG_NAND is not set - -# -# Filesystem support -# CONFIG_FS_CRAMFS=y -CONFIG_ZLIB=y -CONFIG_BZLIB=y -CONFIG_CRC32=y diff --git a/arch/m68k/include/asm/posix_types.h b/arch/m68k/include/asm/posix_types.h index c40c41d041..d83afe94a2 100644 --- a/arch/m68k/include/asm/posix_types.h +++ b/arch/m68k/include/asm/posix_types.h @@ -27,7 +27,6 @@ #define __ARCH_M68K_POSIX_TYPES_H -typedef unsigned short __kernel_dev_t; typedef unsigned long __kernel_ino_t; typedef unsigned short __kernel_mode_t; typedef unsigned short __kernel_nlink_t; diff --git a/arch/m68k/lib/m68k-linuxboot.c b/arch/m68k/lib/m68k-linuxboot.c index 417a8e0cd7..e5e90a8722 100644 --- a/arch/m68k/lib/m68k-linuxboot.c +++ b/arch/m68k/lib/m68k-linuxboot.c @@ -109,20 +109,20 @@ static int do_bootm_linux(struct image_data *data) const char *commandline = getenv ("bootargs"); uint32_t loadaddr,loadsize; - if (os_header->ih_type == IH_TYPE_MULTI) { + if (image_check_type(os_header, IH_TYPE_MULTI)) { printf("Multifile images not handled at the moment\n"); return -1; } printf("commandline: %s\n", commandline); - theKernel = (void (*)(int,int,uint))ntohl((os_header->ih_ep)); + theKernel = (void (*)(int,int,uint))image_get_ep(os_header); debug ("## Transferring control to Linux (at address %08lx) ...\n", (ulong) theKernel); - loadaddr = (uint32_t)ntohl(os_header->ih_load); - loadsize = (uint32_t)ntohl(os_header->ih_size); + loadaddr = (uint32_t)image_get_load(os_header); + loadsize = (uint32_t)image_get_size(os_header); setup_boot_record( (char*)(loadaddr+loadsize),(char*)commandline); if (relocate_image(data->os, (void *)loadaddr)) diff --git a/arch/ppc/boards/pcm030/pcm030.c b/arch/ppc/boards/pcm030/pcm030.c index f3845adf4c..8b43550942 100644 --- a/arch/ppc/boards/pcm030/pcm030.c +++ b/arch/ppc/boards/pcm030/pcm030.c @@ -38,6 +38,7 @@ #include <reloc.h> struct device_d cfi_dev = { + .id = -1, .name = "cfi_flash", .map_base = 0xff000000, .size = 16 * 1024 * 1024, @@ -49,6 +50,7 @@ static struct memory_platform_data ram_pdata = { }; struct device_d sdram_dev = { + .id = -1, .name = "mem", .map_base = 0x0, .size = 64 * 1024 * 1024, @@ -60,6 +62,7 @@ static struct mpc5xxx_fec_platform_data fec_info = { }; struct device_d eth_dev = { + .id = -1, .name = "fec_mpc5xxx", .map_base = MPC5XXX_FEC, .platform_data = &fec_info, @@ -80,12 +83,14 @@ static int devices_init (void) device_initcall(devices_init); static struct device_d psc3 = { + .id = -1, .name = "mpc5xxx_serial", .map_base = MPC5XXX_PSC3, .size = 4096, }; static struct device_d psc6 = { + .id = -1, .name = "mpc5xxx_serial", .map_base = MPC5XXX_PSC6, .size = 4096, diff --git a/arch/ppc/configs/pcm030_defconfig b/arch/ppc/configs/pcm030_defconfig index 56d8844c0c..601607616f 100644 --- a/arch/ppc/configs/pcm030_defconfig +++ b/arch/ppc/configs/pcm030_defconfig @@ -1,195 +1,22 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2.0.0-rc10 -# Fri Dec 18 11:53:12 2009 -# -CONFIG_BOARDINFO="Phytec Phycore mpc5200b tiny" -CONFIG_ARCH_TEXT_BASE=0x01000000 -CONFIG_MPC5XXX_EARLY_CONSOLE=y -CONFIG_HAS_EARLY_INIT=y -CONFIG_PPC=y -CONFIG_ARCH_MPC5200=y -CONFIG_MPC5200=y -CONFIG_MPC5xxx=y -CONFIG_CACHELINE_SIZE=32 -CONFIG_HAS_REGINFO=y -CONFIG_MACH_PHYCORE_MPC5200B_TINY=y - -# -# Board specific settings -# -CONFIG_MACH_PHYCORE_MPC5200B_TINY_REV=1 -CONFIG_EARLY_CONSOLE_PORT="psc3" -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y -CONFIG_TEXT_BASE=0x01000000 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set -CONFIG_STACK_SIZE=0x8000 -CONFIG_MALLOC_SIZE=0x400000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -# CONFIG_RELOCATABLE is not set -CONFIG_PROMPT="barebox:" -CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set CONFIG_GLOB=y -CONFIG_PROMPT_HUSH_PS2="> " CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -CONFIG_EARLY_CONSOLE_BAUDRATE=115200 CONFIG_OF_FLAT_TREE=y CONFIG_PARTITION=y # CONFIG_DEFAULT_ENVIRONMENT is not set - -# -# Debugging -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y -# CONFIG_CMD_SAVEENV is not set -# CONFIG_CMD_LOADENV is not set -# CONFIG_CMD_EXPORT is not set -# CONFIG_CMD_PRINTENV is not set -# CONFIG_CMD_READLINE is not set -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y - -# -# memory -# -# CONFIG_CMD_LOADB is not set CONFIG_CMD_MEMINFO=y -# CONFIG_CMD_CRC is not set -# CONFIG_CMD_MTEST is not set - -# -# flash -# CONFIG_CMD_FLASH=y - -# -# booting -# -CONFIG_CMD_BOOTM=y CONFIG_CMD_BOOTM_ZLIB=y CONFIG_CMD_BOOTM_BZLIB=y -# CONFIG_CMD_BOOTM_SHOW_TYPE is not set CONFIG_CMD_RESET=y CONFIG_CMD_GO=y -# CONFIG_CMD_TIMEOUT is not set -# CONFIG_CMD_PARTITION is not set -CONFIG_CMD_TEST=y -# CONFIG_CMD_REGINFO is not set -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_NET=y CONFIG_NET_DHCP=y -# CONFIG_NET_RARP is not set -# CONFIG_NET_NFS is not set CONFIG_NET_PING=y CONFIG_NET_TFTP=y - -# -# Drivers -# - -# -# serial drivers -# -CONFIG_DRIVER_SERIAL_MPC5XXX=y -# CONFIG_DRIVER_SERIAL_NS16550 is not set -CONFIG_MIIDEV=y - -# -# Network drivers -# -# CONFIG_DRIVER_NET_SMC911X is not set -# CONFIG_DRIVER_NET_SMC91111 is not set CONFIG_DRIVER_NET_MPC5200=y - -# -# SPI drivers -# -CONFIG_SPI=y -# CONFIG_DRIVER_SPI_MC13783 is not set -# CONFIG_I2C is not set - -# -# flash drivers -# -CONFIG_HAS_CFI=y CONFIG_DRIVER_CFI=y -# CONFIG_DRIVER_CFI_NEW is not set -CONFIG_DRIVER_CFI_OLD=y -# CONFIG_CFI_BUFFER_WRITE is not set -# CONFIG_NAND is not set -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# CONFIG_FS_CRAMFS=y -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_ZLIB=y -CONFIG_BZLIB=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set diff --git a/arch/ppc/include/asm/posix_types.h b/arch/ppc/include/asm/posix_types.h index 9170728117..a7af4064ee 100644 --- a/arch/ppc/include/asm/posix_types.h +++ b/arch/ppc/include/asm/posix_types.h @@ -7,7 +7,6 @@ * assume GCC is being used. */ -typedef unsigned int __kernel_dev_t; typedef unsigned int __kernel_ino_t; typedef unsigned int __kernel_mode_t; typedef unsigned short __kernel_nlink_t; diff --git a/arch/ppc/include/asm/processor.h b/arch/ppc/include/asm/processor.h index b336f48b78..9c6f79aca3 100644 --- a/arch/ppc/include/asm/processor.h +++ b/arch/ppc/include/asm/processor.h @@ -9,6 +9,7 @@ #include <asm/ptrace.h> #include <asm/types.h> +#include <linux/stringify.h> /* Machine State Register (MSR) Fields */ @@ -887,22 +888,19 @@ n: /* Macros for setting and retrieving special purpose registers */ -#define stringify(s) tostring(s) -#define tostring(s) #s - #define mfdcr(rn) ({unsigned int rval; \ - asm volatile("mfdcr %0," stringify(rn) \ + asm volatile("mfdcr %0," __stringify(rn) \ : "=r" (rval)); rval;}) -#define mtdcr(rn, v) asm volatile("mtdcr " stringify(rn) ",%0" : : "r" (v)) +#define mtdcr(rn, v) asm volatile("mtdcr " __stringify(rn) ",%0" : : "r" (v)) #define mfmsr() ({unsigned int rval; \ asm volatile("mfmsr %0" : "=r" (rval)); rval;}) #define mtmsr(v) asm volatile("mtmsr %0" : : "r" (v)) #define mfspr(rn) ({unsigned int rval; \ - asm volatile("mfspr %0," stringify(rn) \ + asm volatile("mfspr %0," __stringify(rn) \ : "=r" (rval)); rval;}) -#define mtspr(rn, v) asm volatile("mtspr " stringify(rn) ",%0" : : "r" (v)) +#define mtspr(rn, v) asm volatile("mtspr " __stringify(rn) ",%0" : : "r" (v)) #define tlbie(v) asm volatile("tlbie %0 \n sync" : : "r" (v)) diff --git a/arch/ppc/lib/ppclinux.c b/arch/ppc/lib/ppclinux.c index 35a9d31a8e..5ee908d132 100644 --- a/arch/ppc/lib/ppclinux.c +++ b/arch/ppc/lib/ppclinux.c @@ -45,7 +45,7 @@ static int do_bootm_linux(struct image_data *idata) printf("entering %s: os_header: %p initrd_header: %p oftree: %s\n", __FUNCTION__, os_header, initrd_header, idata->oftree); - if (os_header->ih_type == IH_TYPE_MULTI) { + if (image_check_type(os_header, IH_TYPE_MULTI)) { unsigned long *data = (unsigned long *)(idata->os->data); unsigned long len1 = 0, len2 = 0; @@ -199,9 +199,9 @@ static int do_bootm_linux(struct image_data *idata) #endif /* CONFIG_MPC5xxx */ } - kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))ntohl(os_header->ih_ep); /* FIXME */ + kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))image_get_ep(os_header); /* FIXME */ - if (relocate_image(idata->os, (void *)ntohl(os_header->ih_load))) + if (relocate_image(idata->os, (void *)image_get_load(os_header))) return -1; #if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500) diff --git a/arch/sandbox/board/board.c b/arch/sandbox/board/board.c index 84017eb50d..7d489fd906 100644 --- a/arch/sandbox/board/board.c +++ b/arch/sandbox/board/board.c @@ -28,6 +28,7 @@ #include <errno.h> static struct device_d tap_device = { + .id = -1, .name = "tap", }; diff --git a/arch/sandbox/configs/sandbox_defconfig b/arch/sandbox/configs/sandbox_defconfig index 9037c8ba92..d105584a81 100644 --- a/arch/sandbox/configs/sandbox_defconfig +++ b/arch/sandbox/configs/sandbox_defconfig @@ -1,63 +1,9 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2.0.0-rc10 -# Fri Dec 18 11:53:08 2009 -# -CONFIG_ARCH_TEXT_BASE=0x00000000 -CONFIG_BOARDINFO="sandbox" -CONFIG_LINUX=y -CONFIG_GREGORIAN_CALENDER=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_STACK_SIZE=0x8000 -CONFIG_MALLOC_SIZE=0x400000 -# CONFIG_BROKEN is not set -# CONFIG_EXPERIMENTAL is not set -CONFIG_PROMPT="barebox:" -CONFIG_BAUDRATE=115200 -# CONFIG_LONGHELP is not set -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set CONFIG_GLOB=y -CONFIG_PROMPT_HUSH_PS2="> " CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/sandbox/board/env" - -# -# Debugging -# CONFIG_DEBUG_INFO=y -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -65,100 +11,17 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y -CONFIG_CMD_TRUE=y -CONFIG_CMD_FALSE=y - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y - -# -# memory -# -# CONFIG_CMD_LOADB is not set CONFIG_CMD_MEMINFO=y CONFIG_CMD_CRC=y -# CONFIG_CMD_MTEST is not set - -# -# flash -# -# CONFIG_CMD_FLASH is not set - -# -# booting -# # CONFIG_CMD_BOOTM is not set CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y CONFIG_NET=y CONFIG_NET_DHCP=y -# CONFIG_NET_RARP is not set -# CONFIG_NET_NFS is not set CONFIG_NET_PING=y CONFIG_NET_TFTP=y - -# -# Drivers -# - -# -# serial drivers -# -CONFIG_DRIVER_SERIAL_LINUX_COMSOLE=y -# CONFIG_DRIVER_SERIAL_NS16550 is not set - -# -# Network drivers -# -# CONFIG_DRIVER_NET_SMC911X is not set -# CONFIG_DRIVER_NET_SMC91111 is not set CONFIG_DRIVER_NET_TAP=y - -# -# SPI drivers -# # CONFIG_SPI is not set -# CONFIG_I2C is not set - -# -# flash drivers -# -# CONFIG_DRIVER_CFI is not set -# CONFIG_DRIVER_CFI_OLD is not set -# CONFIG_NAND is not set -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# CONFIG_FS_CRAMFS=y -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_ZLIB=y -CONFIG_CRC32=y -CONFIG_GENERIC_FIND_NEXT_BIT=y diff --git a/arch/sandbox/include/asm/posix_types.h b/arch/sandbox/include/asm/posix_types.h index 5dcc842ab7..4345141d29 100644 --- a/arch/sandbox/include/asm/posix_types.h +++ b/arch/sandbox/include/asm/posix_types.h @@ -7,7 +7,6 @@ * assume GCC is being used. */ -typedef unsigned short __kernel_dev_t; typedef unsigned long __kernel_ino_t; typedef unsigned short __kernel_mode_t; typedef unsigned short __kernel_nlink_t; diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c index acfa35e035..c73aa79f2e 100644 --- a/arch/sandbox/os/common.c +++ b/arch/sandbox/os/common.c @@ -1,3 +1,4 @@ + /* * common.c - common wrapper functions between barebox and the host * @@ -296,7 +297,23 @@ int main(int argc, char *argv[]) } mem_malloc_init(ram, ram + malloc_size); - while ((opt = getopt(argc, argv, "hi:e:I:O:")) != -1) { + while (1) { + int option_index = 0; + static struct option long_options[] = { + {"help", 0, 0, 'h'}, + {"image", 1, 0, 'i'}, + {"env", 1, 0, 'e'}, + {"stdout", 1, 0, 'O'}, + {"stdin", 1, 0, 'I'}, + {0, 0, 0, 0}, + }; + + opt = getopt_long(argc, argv, "hi:e:O:I:", + long_options, &option_index); + + if (opt == -1) + break; + switch (opt) { case 'h': print_usage(basename(argv[0])); @@ -363,19 +380,20 @@ static void print_usage(const char *prgname) { printf( "Usage: %s [OPTIONS]\n" -"Start barebox.\n" -"Options:\n" -" -i <file> Map a file to barebox. This option can be given multiple\n" -" times. The files will show up as /dev/fd0 ... /dev/fdx\n" -" under barebox.\n" -" -e <file> Map a file to barebox. With this option files are mapped as\n" -" /dev/env0 ... /dev/envx and thus are used as default\n" -" environment. An empty file generated with dd will do to get\n" -" started wth an empty environment\n" -" -O <file> Register file as a console capable of doing stdout. File can\n" -" be a regular file or a fifo.\n" -" -I <file> Register file as a console capable of doing stdin. File can\n" -" be a regular file or a fifo.\n", +"Start barebox.\n\n" +"Options:\n\n" +" -i, --image=<file> Map an image file to barebox. This option can be given\n" +" multiple times. The files will show up as\n" +" /dev/fd0 ... /dev/fdx under barebox.\n" +" -e, --env=<file> Map a file with an environment to barebox. With this \n" +" option, files are mapped as /dev/env0 ... /dev/envx\n" +" and thus are used as the default environment.\n" +" An empty file generated with dd will do to get started\n" +" with an empty environment.\n" +" -O, --stdout=<file> Register a file as a console capable of doing stdout.\n" +" <file> can be a regular file or a FIFO.\n" +" -I, --stdin=<file> Register a file as a console capable of doing stdin.\n" +" <file> can be a regular file or a FIFO.\n", prgname ); } diff --git a/arch/x86/boards/x86_generic/generic_pc.c b/arch/x86/boards/x86_generic/generic_pc.c index bd93bc168d..a6cd7e0de3 100644 --- a/arch/x86/boards/x86_generic/generic_pc.c +++ b/arch/x86/boards/x86_generic/generic_pc.c @@ -36,6 +36,7 @@ static struct memory_platform_data ram_pdata = { }; static struct device_d sdram_dev = { + .id = -1, .name = "mem", .size = 16 * 1024 * 1024, .map_base = 0, @@ -43,6 +44,7 @@ static struct device_d sdram_dev = { }; static struct device_d bios_disk_dev = { + .id = -1, .name = "biosdrive", .size = 1, }; @@ -95,6 +97,7 @@ static struct NS16550_plat serial_plat = { /* we are expecting always one serial interface */ static struct device_d generic_pc_serial_device = { + .id = -1, .name = "serial_ns16550", .map_base = 0x3f8, .size = 8, diff --git a/arch/x86/configs/generic_defconfig b/arch/x86/configs/generic_defconfig index 3c72242415..ee13e5c77f 100644 --- a/arch/x86/configs/generic_defconfig +++ b/arch/x86/configs/generic_defconfig @@ -1,85 +1,15 @@ -# -# Automatically generated make config: don't edit -# barebox version: 2009.12.0-x86-trunk -# -CONFIG_ARCH_TEXT_BASE=0x00007c00 -CONFIG_BOARDINFO="Generic x86 bootloader" -# CONFIG_BOARD_LINKER_SCRIPT is not set -CONFIG_GENERIC_LINKER_SCRIPT=y -CONFIG_X86=y -CONFIG_MACH_X86_GENERIC=y -CONFIG_X86_BIOS_BRINGUP=y -# CONFIG_X86_NATIVE_BRINGUP is not set - -# -# BIOS boot source -# CONFIG_X86_HDBOOT=y - -# -# Board specific settings -# -CONFIG_GREGORIAN_CALENDER=y -CONFIG_HAS_KALLSYMS=y -CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y -CONFIG_ENV_HANDLING=y - -# -# General Settings -# -CONFIG_LOCALVERSION_AUTO=y - -# -# memory layout -# -CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y -CONFIG_TEXT_BASE=0x00007c00 -CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y -CONFIG_MEMORY_LAYOUT_DEFAULT=y -# CONFIG_MEMORY_LAYOUT_FIXED is not set CONFIG_STACK_SIZE=0x7000 -CONFIG_MALLOC_SIZE=0x400000 CONFIG_BROKEN=y CONFIG_EXPERIMENTAL=y -# CONFIG_MODULES is not set -# CONFIG_KALLSYMS is not set CONFIG_PROMPT="uboot:" -CONFIG_BAUDRATE=115200 CONFIG_LONGHELP=y -CONFIG_CBSIZE=1024 -CONFIG_MAXARGS=16 -CONFIG_SHELL_HUSH=y -# CONFIG_SHELL_SIMPLE is not set CONFIG_GLOB=y -CONFIG_PROMPT_HUSH_PS2="> " CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DYNAMIC_CRC_TABLE=y -CONFIG_ERRNO_MESSAGES=y -CONFIG_TIMESTAMP=y -CONFIG_CONSOLE_FULL=y -CONFIG_CONSOLE_ACTIVATE_FIRST=y -# CONFIG_OF_FLAT_TREE is not set CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/x86/boards/x86_generic/env" - -# -# Debugging -# CONFIG_DEBUG_INFO=y -# CONFIG_ENABLE_FLASH_NOISE is not set -# CONFIG_ENABLE_PARTITION_NOISE is not set -# CONFIG_ENABLE_DEVICE_NOISE is not set - -# -# Commands -# - -# -# scripting -# CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y @@ -89,98 +19,13 @@ CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y # CONFIG_CMD_TRUE is not set # CONFIG_CMD_FALSE is not set - -# -# file commands -# -CONFIG_CMD_LS=y -CONFIG_CMD_RM=y -CONFIG_CMD_CAT=y -CONFIG_CMD_MKDIR=y -CONFIG_CMD_RMDIR=y -CONFIG_CMD_CP=y -CONFIG_CMD_PWD=y -CONFIG_CMD_CD=y -CONFIG_CMD_MOUNT=y -CONFIG_CMD_UMOUNT=y - -# -# console -# -CONFIG_CMD_CLEAR=y -CONFIG_CMD_ECHO=y - -# -# memory -# -# CONFIG_CMD_LOADB is not set -# CONFIG_CMD_LOADY is not set -# CONFIG_CMD_LOADS is not set CONFIG_CMD_MEMINFO=y -# CONFIG_CMD_CRC is not set -# CONFIG_CMD_MTEST is not set - -# -# flash -# -# CONFIG_CMD_FLASH is not set - -# -# booting -# # CONFIG_CMD_BOOTM is not set -CONFIG_CMD_LINUX16=y CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y -# CONFIG_CMD_PARTITION is not set -CONFIG_CMD_TEST=y -CONFIG_CMD_VERSION=y -CONFIG_CMD_HELP=y -CONFIG_CMD_DEVINFO=y -# CONFIG_NET is not set - -# -# Drivers -# - -# -# serial drivers -# CONFIG_DRIVER_SERIAL_NS16550=y - -# -# SPI drivers -# # CONFIG_SPI is not set -# CONFIG_I2C is not set - -# -# flash drivers -# -# CONFIG_DRIVER_CFI is not set -# CONFIG_DRIVER_CFI_OLD is not set -# CONFIG_NAND is not set CONFIG_ATA=y - -# -# drive types -# CONFIG_ATA_DISK=y - -# -# interface types -# CONFIG_ATA_BIOS=y -# CONFIG_USB is not set -# CONFIG_USB_GADGET is not set -# CONFIG_VIDEO is not set - -# -# Filesystem support -# -# CONFIG_FS_CRAMFS is not set -CONFIG_FS_RAMFS=y -CONFIG_FS_DEVFS=y -CONFIG_CRC32=y -# CONFIG_GENERIC_FIND_NEXT_BIT is not set diff --git a/arch/x86/include/asm/posix_types.h b/arch/x86/include/asm/posix_types.h index a22f301aee..927868132a 100644 --- a/arch/x86/include/asm/posix_types.h +++ b/arch/x86/include/asm/posix_types.h @@ -27,7 +27,6 @@ #define _ASM_X86_POSIX_TYPES_H typedef unsigned long __kernel_ino_t; -typedef unsigned short __kernel_dev_t; typedef unsigned short __kernel_mode_t; typedef unsigned short __kernel_nlink_t; typedef long __kernel_off_t; |