diff -Nrup linux-2.6.3-uc0/Makefile linux-2.6.x/Makefile --- linux-2.6.3-uc0/Makefile 2004-03-21 09:30:40.000000000 +0100 +++ linux-2.6.x/Makefile 2004-03-21 09:31:19.000000000 +0100 @@ -486,6 +486,7 @@ define cmd_vmlinux__ $(drivers-y) \ $(net-y) \ --end-group \ + -M -Map $@.map \ $(filter .tmp_kallsyms%,$^) \ -o $@ endef diff -Nrup linux-2.6.3-uc0/arch/m68knommu/Kconfig linux-2.6.x/arch/m68knommu/Kconfig --- linux-2.6.3-uc0/arch/m68knommu/Kconfig 2004-03-21 09:30:39.000000000 +0100 +++ linux-2.6.x/arch/m68knommu/Kconfig 2004-03-21 09:31:19.000000000 +0100 @@ -288,6 +288,29 @@ config M5282C3 help Support for the Motorola M5282C3 board. +config DEVELER_AMR + bool "ISC/Develer AMR board support" + depends on M5272 + help + Support for the ISC/Develer AMR board. + +config DEVELER_CDB4 + bool "AEP/Develer CDB4 board support" + depends on M5272 + help + Support for the AEP/Develer CDB4 board. + +config DEVELER_SEAC + bool "SEAC/Develer SC board support" + depends on M5272 + help + Support for the SEAC/Develer SC board. + +config DEVELER + bool + default y + depends on (DEVELER_AMR || DEVELER_CDB4 || DEVELER_SEAC) + config ARN5307 bool "Arnewsh 5307 board support" depends on M5307 diff -Nrup linux-2.6.3-uc0/arch/m68knommu/Makefile linux-2.6.x/arch/m68knommu/Makefile --- linux-2.6.3-uc0/arch/m68knommu/Makefile 2004-02-18 04:58:45.000000000 +0100 +++ linux-2.6.x/arch/m68knommu/Makefile 2004-03-21 09:31:19.000000000 +0100 @@ -28,6 +28,7 @@ board-$(CONFIG_UCQUICC) := uCquicc board-$(CONFIG_DRAGEN2) := de2 board-$(CONFIG_ARNEWSH) := ARNEWSH board-$(CONFIG_MOTOROLA) := MOTOROLA +board-$(CONFIG_DEVELER) := MOTOROLA board-$(CONFIG_ELITE) := eLITE board-$(CONFIG_eLIA) := eLIA board-$(CONFIG_NETtel) := NETtel diff -Nrup linux-2.6.3-uc0/arch/m68knommu/kernel/vmlinux.lds.S linux-2.6.x/arch/m68knommu/kernel/vmlinux.lds.S --- linux-2.6.3-uc0/arch/m68knommu/kernel/vmlinux.lds.S 2004-02-18 04:57:31.000000000 +0100 +++ linux-2.6.x/arch/m68knommu/kernel/vmlinux.lds.S 2004-03-22 05:46:12.000000000 +0100 @@ -128,6 +128,15 @@ #endif /* + * Develer boards are similar to M5272C3, but we can grab some + * more RAM because we're using colilo instead of dBUG. + */ +#if defined(CONFIG_DEVELER) +#define RAM_START 0x400 +#define RAM_LENGTH 0x3ffc00 +#endif + +/* * These flash boot boards use all of ram for operation. Again the * actual memory size is not important here, assume at least 4MiB. * They currently have no support for running in flash. diff -Nrup linux-2.6.3-uc0/drivers/mtd/chips/Kconfig linux-2.6.x/drivers/mtd/chips/Kconfig --- linux-2.6.3-uc0/drivers/mtd/chips/Kconfig 2004-02-18 04:57:21.000000000 +0100 +++ linux-2.6.x/drivers/mtd/chips/Kconfig 2004-03-21 09:31:19.000000000 +0100 @@ -168,6 +168,17 @@ config MTD_CFI_STAA sets which a CFI-compliant chip may claim to implement. This code provides support for one of those command sets. +config MTD_CFI_BLOCKERASE + bool "Use BLOCK ERASE command" + depends on MTD_CFI_AMDSTD + default n + help + Some flash chips such as the SST S71145, have two different erase + commands, one for sectors (4KB) and one for blocks (64KB). Using + larger erase units might be faster and reduce memory usage of JFFS2 + for such chips. Note that the chip mapping must be adjusted to + reflect this change. + config MTD_RAM tristate "Support for RAM chips in bus mapping" depends on MTD diff -Nrup linux-2.6.3-uc0/drivers/mtd/chips/cfi_cmdset_0002.c linux-2.6.x/drivers/mtd/chips/cfi_cmdset_0002.c --- linux-2.6.3-uc0/drivers/mtd/chips/cfi_cmdset_0002.c 2004-02-18 04:57:40.000000000 +0100 +++ linux-2.6.x/drivers/mtd/chips/cfi_cmdset_0002.c 2004-03-21 09:31:19.000000000 +0100 @@ -1035,8 +1035,12 @@ static inline int do_erase_oneblock(stru cfi_send_gen_cmd(0xAA, cfi->addr_unlock1, chip->start, map, cfi, CFI_DEVICETYPE_X8, NULL); cfi_send_gen_cmd(0x55, cfi->addr_unlock2, chip->start, map, cfi, CFI_DEVICETYPE_X8, NULL); - cfi_write(map, CMD(0x30), adr); - +#if defined(CONFIG_MTD_CFI_BLOCKERASE) + cfi_write(map, CMD(0x50), adr); +#else + cfi_write(map, CMD(0x30), adr); +#endif + timeo = jiffies + (HZ*20); /* Wait for the end of programing/erasure by using the toggle method. diff -Nrup linux-2.6.3-uc0/drivers/mtd/chips/jedec_probe.c linux-2.6.x/drivers/mtd/chips/jedec_probe.c --- linux-2.6.3-uc0/drivers/mtd/chips/jedec_probe.c 2004-02-18 04:59:53.000000000 +0100 +++ linux-2.6.x/drivers/mtd/chips/jedec_probe.c 2004-03-21 09:31:19.000000000 +0100 @@ -1088,6 +1088,28 @@ static const struct amd_flash_info jedec .regions = { ERASEINFO(0x01000,128), } + }, { + .mfr_id = MANUFACTURER_SST, + .dev_id = SST39LF160, + .name = "SST 39LF/VF160", + .uaddr = { + [0] = MTD_UADDR_0x5555_0x2AAA /* x8 */ + }, + .DevSize = SIZE_2MiB, + .CmdSet = P_ID_AMD_STD, +#if CONFIG_MTD_CFI_BLOCKERASE + .NumEraseRegions= 1, + .regions = { + ERASEINFO(0x10000,32) + } +#else + .NumEraseRegions= 2, + /* Split into two regions to get around the 256-region restriction */ + .regions = { + ERASEINFO(0x01000,256), + ERASEINFO(0x01000,256), + } +#endif }, { .mfr_id = MANUFACTURER_SST, .dev_id = SST39SF010A, diff -Nrup linux-2.6.3-uc0/drivers/mtd/maps/Kconfig linux-2.6.x/drivers/mtd/maps/Kconfig --- linux-2.6.3-uc0/drivers/mtd/maps/Kconfig 2004-02-18 04:59:46.000000000 +0100 +++ linux-2.6.x/drivers/mtd/maps/Kconfig 2004-03-21 09:31:19.000000000 +0100 @@ -419,6 +419,15 @@ config MTD_FORTUNET This enables access to the Flash on the FortuNet board. If you have such a board, say 'Y'. +config MTD_M5272C3_JFFS2 + tristate "CFI Flash device on Motorola M5272C3 for JFFS2 usage" + depends on M5272 && MTD_CFI + help + This enables MTD access to CFI and JEDEC compatible flash devices + on board designs derived from the Motorola M5272C3. The partition + map is suitable for using a JFFS2 root filesystem and a bootloader + such as CoLilo. + config MTD_AUTCPU12 tristate "NV-RAM mapping AUTCPU12 board" depends on ARM && ARCH_AUTCPU12 diff -Nrup linux-2.6.3-uc0/drivers/mtd/maps/Makefile linux-2.6.x/drivers/mtd/maps/Makefile --- linux-2.6.3-uc0/drivers/mtd/maps/Makefile 2004-02-18 04:57:11.000000000 +0100 +++ linux-2.6.x/drivers/mtd/maps/Makefile 2004-03-21 09:32:02.000000000 +0100 @@ -50,6 +50,7 @@ obj-$(CONFIG_MTD_FORTUNET) += fortunet.o obj-$(CONFIG_MTD_REDWOOD) += redwood.o obj-$(CONFIG_MTD_UCLINUX) += uclinux.o obj-$(CONFIG_MTD_NETtel) += nettel.o +obj-$(CONFIG_MTD_M5272C3_JFFS2) += m5272c3_jffs2.o obj-$(CONFIG_MTD_SCB2_FLASH) += scb2_flash.o obj-$(CONFIG_MTD_EBONY) += ebony.o obj-$(CONFIG_MTD_BEECH) += beech-mtd.o diff -Nrup linux-2.6.3-uc0/drivers/mtd/maps/m5272c3_jffs2.c linux-2.6.x/drivers/mtd/maps/m5272c3_jffs2.c --- linux-2.6.3-uc0/drivers/mtd/maps/m5272c3_jffs2.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.x/drivers/mtd/maps/m5272c3_jffs2.c 2004-03-21 10:23:34.000000000 +0100 @@ -0,0 +1,109 @@ +/* + * Copyright (C) 2003 Bernardo Innocenti + * + * Based on physmap.c by David Woodhouse + * Based on m5272c3.c + * + * MTD partition map for M5272C3 and similar boards. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +#define WINDOW_ADDR 0xffe00000 +#define WINDOW_SIZE 0x200000 +#define BUSWIDTH 2 + +static struct mtd_info *mymtd; + +static struct map_info m5272c3_jffs2_map = { + .name = "M5272C3 flash device", + .size = WINDOW_SIZE, + .buswidth = BUSWIDTH, + .phys = WINDOW_ADDR +}; + +/* + * MTD 'PARTITIONING' STUFF + */ +static struct mtd_partition m5272c3_jffs2_partitions[] = { + { + .name = "boot (32K)", + .size = 0x8000, + .offset = 0 + }, { + .name = "kernel (480K)", + .size = 0x78000, + .offset = MTDPART_OFS_APPEND /* 0x8000 */ + }, { + .name = "rootfs (1536K)", + .size = MTDPART_SIZ_FULL, /* 0x180000 */ + .offset = MTDPART_OFS_APPEND /* 0x80000 */ + } +}; + +#define NUM_PARTITIONS (sizeof(m5272c3_jffs2_partitions) / sizeof(m5272c3_jffs2_partitions[0])) + + +int __init init_m5272c3_jffs2(void) +{ + printk(KERN_NOTICE "m5272c3[mtd] flash device: %x at %x\n", WINDOW_SIZE, WINDOW_ADDR); + m5272c3_jffs2_map.virt = (unsigned long)ioremap(WINDOW_ADDR, WINDOW_SIZE); + + if (!m5272c3_jffs2_map.virt) { + printk("Failed to ioremap\n"); + return -EIO; + } + + simple_map_init(&m5272c3_jffs2_map); + + if (!(mymtd = do_map_probe("cfi_probe", &m5272c3_jffs2_map))) + mymtd = do_map_probe("jedec_probe", &m5272c3_jffs2_map); + + if (mymtd) { + mymtd->owner = THIS_MODULE; + + printk(KERN_NOTICE + "Using physmap partition definition\n"); + add_mtd_partitions(mymtd, m5272c3_jffs2_partitions, NUM_PARTITIONS); + + printk("m5272c3[mtd]: set '%s' to be root filesystem\n", + m5272c3_jffs2_partitions[2].name); + ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, 2); + + return 0; + } + + iounmap((void *)m5272c3_jffs2_map.virt); + return -ENXIO; +} + +static void __exit cleanup_m5272c3_jffs2(void) +{ + if (mymtd) { + del_mtd_partitions(mymtd); + map_destroy(mymtd); + } + if (m5272c3_jffs2_map.virt) { + iounmap((void *)m5272c3_jffs2_map.virt); + m5272c3_jffs2_map.virt = 0; + } +} + +module_init(init_m5272c3_jffs2); +module_exit(cleanup_m5272c3_jffs2); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Bernardo Innocenti "); +MODULE_DESCRIPTION("Develer MTD map driver"); + diff -Nrup linux-2.6.3-uc0/drivers/mtd/maps/physmap.c linux-2.6.x/drivers/mtd/maps/physmap.c --- linux-2.6.3-uc0/drivers/mtd/maps/physmap.c 2004-02-18 04:58:32.000000000 +0100 +++ linux-2.6.x/drivers/mtd/maps/physmap.c 2004-03-21 09:31:19.000000000 +0100 @@ -23,7 +23,7 @@ static struct mtd_info *mymtd; struct map_info physmap_map = { - .name = "Physically mapped flash", + .name = "physmap", .size = WINDOW_SIZE, .buswidth = BUSWIDTH, .phys = WINDOW_ADDR, diff -Nrup linux-2.6.3-uc0/include/asm-m68knommu/atomic.h linux-2.6.x/include/asm-m68knommu/atomic.h --- linux-2.6.3-uc0/include/asm-m68knommu/atomic.h 2004-02-18 04:57:47.000000000 +0100 +++ linux-2.6.x/include/asm-m68knommu/atomic.h 2004-03-21 09:31:19.000000000 +0100 @@ -56,12 +56,12 @@ static __inline__ void atomic_sub(int i, static __inline__ void atomic_inc(volatile atomic_t *v) { - __asm__ __volatile__("addql #1,%0" : "=m" (*v): "0" (*v)); + __asm__ __volatile__("addql #1,%0" : "=m" (*v): "m" (*v)); } static __inline__ void atomic_dec(volatile atomic_t *v) { - __asm__ __volatile__("subql #1,%0" : "=m" (*v): "0" (*v)); + __asm__ __volatile__("subql #1,%0" : "=m" (*v): "m" (*v)); } static __inline__ int atomic_dec_and_test(volatile atomic_t *v) diff -Nrup linux-2.6.3-uc0/include/asm-m68knommu/system.h linux-2.6.x/include/asm-m68knommu/system.h --- linux-2.6.3-uc0/include/asm-m68knommu/system.h 2004-02-18 04:58:32.000000000 +0100 +++ linux-2.6.x/include/asm-m68knommu/system.h 2004-03-21 09:31:19.000000000 +0100 @@ -232,7 +232,9 @@ cmpxchg(volatile int *p, int old, int ne #endif #ifdef CONFIG_COLDFIRE -#if defined(CONFIG_M5272) && defined(CONFIG_NETtel) +#if defined(CONFIG_M5272) + +#if defined(CONFIG_NETtel) /* * Need to account for broken early mask of 5272 silicon. So don't * jump through the original start address. Jump strait into the @@ -244,6 +246,15 @@ cmpxchg(volatile int *p, int old, int ne jmp 0xf0000400; \ "); \ }) +#elif defined(CONFIG_DEVELER_AMR) || defined(CONFIG_DEVELER_CDB4) || defined(CONFIG_DEVELER_SEAC) +#define HARD_RESET_NOW() ({ \ + asm( \ + "movew #0x2700, %sr\n\t" \ + "jmp 0xffe00400\n" \ + ); \ +}) +#endif /* CONFIG_NETtel || CONFIG_DEVELER */ + #elif defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || defined(CONFIG_DISKtel) || defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA) #define HARD_RESET_NOW() ({ \ asm(" \ diff -Nrup linux-2.6.3-uc0/net/xfrm/Kconfig linux-2.6.x/net/xfrm/Kconfig --- linux-2.6.3-uc0/net/xfrm/Kconfig 2004-02-18 04:57:58.000000000 +0100 +++ linux-2.6.x/net/xfrm/Kconfig 2004-03-21 09:31:19.000000000 +0100 @@ -2,7 +2,7 @@ # XFRM configuration # config XFRM - bool + bool "Kick me" depends on NET config XFRM_USER