mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
66d857b08b
There is a lot of common code that could be shared between the m68k and m68knommu arch branches. It makes sense to merge the two branches into a single directory structure so that we can more easily share that common code. This is a brute force merge, based on a script from Stephen King <sfking@fdwdc.com>, which was originally written by Arnd Bergmann <arnd@arndb.de>. > The script was inspired by the script Sam Ravnborg used to merge the > includes from m68knommu. For those files common to both arches but > differing in content, the m68k version of the file is renamed to > <file>_mm.<ext> and the m68knommu version of the file is moved into the > corresponding m68k directory and renamed <file>_no.<ext> and a small > wrapper file <file>.<ext> is used to select between the two version. Files > that are common to both but don't differ are removed from the m68knommu > tree and files and directories that are unique to the m68knommu tree are > moved to the m68k tree. Finally, the arch/m68knommu tree is removed. > > To select between the the versions of the files, the wrapper uses > > #ifdef CONFIG_MMU > #include <file>_mm.<ext> > #else > #include <file>_no.<ext> > #endif On top of this file merge I have done a simplistic merge of m68k and m68knommu Kconfig, which primarily attempts to keep existing options and menus in place. Other than a handful of options being moved it produces identical .config outputs on m68k and m68knommu targets I tested it on. With this in place there is now quite a bit of scope for merge cleanups in future patches. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
69 lines
1.8 KiB
Text
69 lines
1.8 KiB
Text
# CONFIG_MMU is not set
|
|
CONFIG_EXPERIMENTAL=y
|
|
CONFIG_LOG_BUF_SHIFT=14
|
|
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
|
|
CONFIG_EXPERT=y
|
|
# CONFIG_KALLSYMS is not set
|
|
# CONFIG_HOTPLUG is not set
|
|
# CONFIG_FUTEX is not set
|
|
# CONFIG_EPOLL is not set
|
|
# CONFIG_SIGNALFD is not set
|
|
# CONFIG_TIMERFD is not set
|
|
# CONFIG_EVENTFD is not set
|
|
# CONFIG_AIO is not set
|
|
# CONFIG_VM_EVENT_COUNTERS is not set
|
|
# CONFIG_SLUB_DEBUG is not set
|
|
# CONFIG_BLK_DEV_BSG is not set
|
|
# CONFIG_IOSCHED_DEADLINE is not set
|
|
# CONFIG_IOSCHED_CFQ is not set
|
|
CONFIG_M5249=y
|
|
CONFIG_CLOCK_SET=y
|
|
CONFIG_CLOCK_FREQ=140000000
|
|
CONFIG_CLOCK_DIV=2
|
|
CONFIG_M5249C3=y
|
|
CONFIG_RAMBASE=0x00000000
|
|
CONFIG_RAMSIZE=0x00800000
|
|
CONFIG_VECTORBASE=0x00000000
|
|
CONFIG_KERNELBASE=0x00020000
|
|
CONFIG_BINFMT_FLAT=y
|
|
CONFIG_NET=y
|
|
CONFIG_PACKET=y
|
|
CONFIG_UNIX=y
|
|
CONFIG_INET=y
|
|
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
|
|
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
|
|
# CONFIG_INET_XFRM_MODE_BEET is not set
|
|
# CONFIG_INET_LRO is not set
|
|
# CONFIG_INET_DIAG is not set
|
|
# CONFIG_IPV6 is not set
|
|
# CONFIG_FW_LOADER is not set
|
|
CONFIG_MTD=y
|
|
CONFIG_MTD_PARTITIONS=y
|
|
CONFIG_MTD_CHAR=y
|
|
CONFIG_MTD_BLOCK=y
|
|
CONFIG_MTD_RAM=y
|
|
CONFIG_MTD_UCLINUX=y
|
|
CONFIG_BLK_DEV_RAM=y
|
|
# CONFIG_MISC_DEVICES is not set
|
|
CONFIG_NETDEVICES=y
|
|
CONFIG_NET_ETHERNET=y
|
|
# CONFIG_NETDEV_1000 is not set
|
|
# CONFIG_NETDEV_10000 is not set
|
|
CONFIG_PPP=y
|
|
# CONFIG_INPUT is not set
|
|
# CONFIG_SERIO is not set
|
|
# CONFIG_VT is not set
|
|
CONFIG_SERIAL_MCF=y
|
|
CONFIG_SERIAL_MCF_CONSOLE=y
|
|
# CONFIG_UNIX98_PTYS is not set
|
|
# CONFIG_HWMON is not set
|
|
# CONFIG_USB_SUPPORT is not set
|
|
CONFIG_EXT2_FS=y
|
|
# CONFIG_FILE_LOCKING is not set
|
|
CONFIG_ROMFS_FS=y
|
|
CONFIG_ROMFS_BACKED_BY_MTD=y
|
|
# CONFIG_NETWORK_FILESYSTEMS is not set
|
|
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
|
|
CONFIG_BOOTPARAM=y
|
|
CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0"
|
|
# CONFIG_CRC32 is not set
|