diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-15 13:43:03 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-15 13:43:03 +0100 |
| commit | 7c2517c2444fdd5c2eceee330a03ff15d12602ca (patch) | |
| tree | 1770d5217d689f0513bb1534c7e4dfbf114800fc /arch | |
| parent | cbc25b2b8488452085d3195dfc7164b00a265364 (diff) | |
| parent | 0473048c4fa5410b0c4a75f667f7b317e44c15df (diff) | |
| download | barebox-7c2517c2444fdd5c2eceee330a03ff15d12602ca.tar.gz barebox-7c2517c2444fdd5c2eceee330a03ff15d12602ca.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boards/at91sam9263ek/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/boards/clep7212/clep7212.c | 2 | ||||
| -rw-r--r-- | arch/arm/boards/clep7212/defaultenv-clep7212/init/mtdparts-nor | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/at91sam9263_devices.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-clps711x/Kconfig | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/boards/at91sam9263ek/Makefile b/arch/arm/boards/at91sam9263ek/Makefile index 66083a239e..d4d5e76395 100644 --- a/arch/arm/boards/at91sam9263ek/Makefile +++ b/arch/arm/boards/at91sam9263ek/Makefile @@ -1,7 +1,7 @@ ifeq ($(CONFIG_OFDEVICE),) obj-y += init.o endif -obj-$(CONFIG_OF_DEVICE) += of_init.o +obj-$(CONFIG_OFDEVICE) += of_init.o lwl-y += lowlevel_init.o diff --git a/arch/arm/boards/clep7212/clep7212.c b/arch/arm/boards/clep7212/clep7212.c index 584ecdcab2..641fa15021 100644 --- a/arch/arm/boards/clep7212/clep7212.c +++ b/arch/arm/boards/clep7212/clep7212.c @@ -37,7 +37,7 @@ static int clps711x_devices_init(void) add_cfi_flash_device(DEVICE_ID_DYNAMIC, (unsigned long)cfi_io, SZ_32M, IORESOURCE_MEM); - devfs_add_partition("nor0", 0x00000, SZ_256K, DEVFS_PARTITION_FIXED, + devfs_add_partition("nor0", 0x00000, SZ_512K, DEVFS_PARTITION_FIXED, "self0"); devfs_add_partition("nor0", SZ_256K, SZ_256K, DEVFS_PARTITION_FIXED, "env0"); diff --git a/arch/arm/boards/clep7212/defaultenv-clep7212/init/mtdparts-nor b/arch/arm/boards/clep7212/defaultenv-clep7212/init/mtdparts-nor index 39777f95f2..e2e518ca66 100644 --- a/arch/arm/boards/clep7212/defaultenv-clep7212/init/mtdparts-nor +++ b/arch/arm/boards/clep7212/defaultenv-clep7212/init/mtdparts-nor @@ -1,6 +1,6 @@ #!/bin/sh -mtdparts="256k(boot),256k(env),3584k(kernel),-(root)" +mtdparts="512k(boot),256k(env),3584k(kernel),-(root)" kernelname="physmap-flash.0" mtdparts-add -d nor0 -k ${kernelname} -p ${mtdparts} diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c index a67345f05d..c7e4962a93 100644 --- a/arch/arm/mach-at91/at91sam9263_devices.c +++ b/arch/arm/mach-at91/at91sam9263_devices.c @@ -396,6 +396,9 @@ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) } else { /* MCI1 */ start = AT91SAM9263_BASE_MCI1; + /* CLK */ + at91_set_A_periph(AT91_PIN_PA6, 0); + if (data->slot_b) { /* CMD */ at91_set_A_periph(AT91_PIN_PA21, 1); diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig index 0853ce2e62..c00514e86d 100644 --- a/arch/arm/mach-clps711x/Kconfig +++ b/arch/arm/mach-clps711x/Kconfig @@ -24,7 +24,7 @@ endmenu config ARCH_TEXT_BASE hex - default 0xc0780000 if MACH_CLEP7212 + default 0xc0740000 if MACH_CLEP7212 config BAREBOX_MAX_IMAGE_SIZE hex |