Skip to content

L
linux
Commit 8cf7a16e authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k updates from Geert Uytterhoeven:
 - Zorro bus cleanups and UAPI revival
 - Bootinfo cleanups and UAPI revival
 - Kexec support
 - Memory size reductions and bug fixes for multi-platform kernels
 - Polled interrupt support for Atari EtherNAT, EtherNEC and NetUSBee
 - Machine-specific random_get_entropy()
 - Defconfig updates and cleanups

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (46 commits)
  m68k/mac: Make SCC reset work more reliably
  m68k/irq - Use polled IRQ flag for MFP timer cascaded interrupts
  m68k: Update defconfigs for v3.13-rc1
  m68k/defconfig: Enable EARLY_PRINTK
  m68k/mm: kmap spelling/grammar fixes
  m68k: Convert arch/m68k/kernel/traps.c to pr_*()
  m68k: Convert arch/m68k/mm/fault.c to pr_*()
  m68k/mm: Check for mm != NULL in do_page_fault() debug code
  m68k/defconfig: Disable /sbin/hotplug fork-bomb by default
  m68k/atari: Hide RTC_PORT() macro from rtc-cmos
  m68k/amiga,atari: Fix specifying multiple debug= parameters
  m68k/defconfig: Use ext4 for ext2/ext3 file systems
  m68k: Add support to export bootinfo in procfs
  m68k: Add kexec support
  m68k/mac: Mark Mac IIsi ADB driver BROKEN
  m68k/amiga: Provide mach_random_get_entropy()
  m68k: Add infrastructure for machine-specific random_get_entropy()
  m68k/atari: Call paging_init() before nf_init()
  m68k: Remove superfluous inclusions of <asm/bootinfo.h>
  m68k/UAPI: Use proper types (endianness/size) in <asm/bootinfo*.h>
  ...
parents f479c01c 56931d73
Hide whitespace changes
Inline Side-by-side
Showing with 1992 additions and 1155 deletions
Documentation/zorro.txt
View file @ 8cf7a16e
...@@ -95,8 +95,9 @@ The treatment of these regions depends on the type of Zorro space: ...@@ -95,8 +95,9 @@ The treatment of these regions depends on the type of Zorro space:
------------- -------------
linux/include/linux/zorro.h linux/include/linux/zorro.h
linux/include/asm-{m68k,ppc}/zorro.h linux/include/uapi/linux/zorro.h
linux/include/linux/zorro_ids.h linux/include/uapi/linux/zorro_ids.h
linux/arch/m68k/include/asm/zorro.h
linux/drivers/zorro linux/drivers/zorro
/proc/bus/zorro /proc/bus/zorro
arch/m68k/Kconfig
View file @ 8cf7a16e
...@@ -87,6 +87,30 @@ config MMU_SUN3 ...@@ -87,6 +87,30 @@ config MMU_SUN3
bool bool
depends on MMU && !MMU_MOTOROLA && !MMU_COLDFIRE depends on MMU && !MMU_MOTOROLA && !MMU_COLDFIRE
config KEXEC
bool "kexec system call"
depends on M68KCLASSIC
help
kexec is a system call that implements the ability to shutdown your
current kernel, and to start another kernel. It is like a reboot
but it is independent of the system firmware. And like a reboot
you can start any kernel with it, not just Linux.
The name comes from the similarity to the exec system call.
It is an ongoing process to be certain the hardware in a machine
is properly shutdown, so do not be surprised if this code does not
initially work for you. As of this writing the exact hardware
interface is strongly in flux, so no good recommendation can be
made.
config BOOTINFO_PROC
bool "Export bootinfo in procfs"
depends on KEXEC && M68KCLASSIC
help
Say Y to export the bootinfo used to boot the kernel in a
"bootinfo" file in procfs. This is useful with kexec.
menu "Platform setup" menu "Platform setup"
source arch/m68k/Kconfig.cpu source arch/m68k/Kconfig.cpu
......
arch/m68k/amiga/chipram.c
View file @ 8cf7a16e
...@@ -87,7 +87,7 @@ void *amiga_chip_alloc_res(unsigned long size, struct resource *res) ...@@ -87,7 +87,7 @@ void *amiga_chip_alloc_res(unsigned long size, struct resource *res)
atomic_sub(size, &chipavail); atomic_sub(size, &chipavail);
pr_debug("amiga_chip_alloc_res: returning %pR\n", res); pr_debug("amiga_chip_alloc_res: returning %pR\n", res);
return (void *)ZTWO_VADDR(res->start); return ZTWO_VADDR(res->start);
} }
void amiga_chip_free(void *ptr) void amiga_chip_free(void *ptr)
......
arch/m68k/amiga/config.c
View file @ 8cf7a16e
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
#include <linux/keyboard.h> #include <linux/keyboard.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/bootinfo-amiga.h>
#include <asm/byteorder.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/amigahw.h> #include <asm/amigahw.h>
...@@ -140,46 +142,46 @@ static struct resource ram_resource[NUM_MEMINFO]; ...@@ -140,46 +142,46 @@ static struct resource ram_resource[NUM_MEMINFO];
* Parse an Amiga-specific record in the bootinfo * Parse an Amiga-specific record in the bootinfo
*/ */
int amiga_parse_bootinfo(const struct bi_record *record) int __init amiga_parse_bootinfo(const struct bi_record *record)
{ {
int unknown = 0; int unknown = 0;
const unsigned long *data = record->data; const void *data = record->data;
switch (record->tag) { switch (be16_to_cpu(record->tag)) {
case BI_AMIGA_MODEL: case BI_AMIGA_MODEL:
amiga_model = *data; amiga_model = be32_to_cpup(data);
break; break;
case BI_AMIGA_ECLOCK: case BI_AMIGA_ECLOCK:
amiga_eclock = *data; amiga_eclock = be32_to_cpup(data);
break; break;
case BI_AMIGA_CHIPSET: case BI_AMIGA_CHIPSET:
amiga_chipset = *data; amiga_chipset = be32_to_cpup(data);
break; break;
case BI_AMIGA_CHIP_SIZE: case BI_AMIGA_CHIP_SIZE:
amiga_chip_size = *(const int *)data; amiga_chip_size = be32_to_cpup(data);
break; break;
case BI_AMIGA_VBLANK: case BI_AMIGA_VBLANK:
amiga_vblank = *(const unsigned char *)data; amiga_vblank = *(const __u8 *)data;
break; break;
case BI_AMIGA_PSFREQ: case BI_AMIGA_PSFREQ:
amiga_psfreq = *(const unsigned char *)data; amiga_psfreq = *(const __u8 *)data;
break; break;
case BI_AMIGA_AUTOCON: case BI_AMIGA_AUTOCON:
#ifdef CONFIG_ZORRO #ifdef CONFIG_ZORRO
if (zorro_num_autocon < ZORRO_NUM_AUTO) { if (zorro_num_autocon < ZORRO_NUM_AUTO) {
const struct ConfigDev *cd = (struct ConfigDev *)data; const struct ConfigDev *cd = data;
struct zorro_dev *dev = &zorro_autocon[zorro_num_autocon++]; struct zorro_dev_init *dev = &zorro_autocon_init[zorro_num_autocon++];
dev->rom = cd->cd_Rom; dev->rom = cd->cd_Rom;
dev->slotaddr = cd->cd_SlotAddr; dev->slotaddr = be16_to_cpu(cd->cd_SlotAddr);
dev->slotsize = cd->cd_SlotSize; dev->slotsize = be16_to_cpu(cd->cd_SlotSize);
dev->resource.start = (unsigned long)cd->cd_BoardAddr; dev->boardaddr = be32_to_cpu(cd->cd_BoardAddr);
dev->resource.end = dev->resource.start + cd->cd_BoardSize - 1; dev->boardsize = be32_to_cpu(cd->cd_BoardSize);
} else } else
printk("amiga_parse_bootinfo: too many AutoConfig devices\n"); printk("amiga_parse_bootinfo: too many AutoConfig devices\n");
#endif /* CONFIG_ZORRO */ #endif /* CONFIG_ZORRO */
...@@ -358,6 +360,14 @@ static void __init amiga_identify(void) ...@@ -358,6 +360,14 @@ static void __init amiga_identify(void)
#undef AMIGAHW_ANNOUNCE #undef AMIGAHW_ANNOUNCE
} }
static unsigned long amiga_random_get_entropy(void)
{
/* VPOSR/VHPOSR provide at least 17 bits of data changing at 1.79 MHz */
return *(unsigned long *)&amiga_custom.vposr;
}
/* /*
* Setup the Amiga configuration info * Setup the Amiga configuration info
*/ */
...@@ -395,6 +405,8 @@ void __init config_amiga(void) ...@@ -395,6 +405,8 @@ void __init config_amiga(void)
mach_heartbeat = amiga_heartbeat; mach_heartbeat = amiga_heartbeat;
#endif #endif
mach_random_get_entropy = amiga_random_get_entropy;
/* Fill in the clock value (based on the 700 kHz E-Clock) */ /* Fill in the clock value (based on the 700 kHz E-Clock) */
amiga_colorclock = 5*amiga_eclock; /* 3.5 MHz */ amiga_colorclock = 5*amiga_eclock; /* 3.5 MHz */
...@@ -608,6 +620,8 @@ static void amiga_mem_console_write(struct console *co, const char *s, ...@@ -608,6 +620,8 @@ static void amiga_mem_console_write(struct console *co, const char *s,
static int __init amiga_savekmsg_setup(char *arg) static int __init amiga_savekmsg_setup(char *arg)
{ {
bool registered;
if (!MACH_IS_AMIGA || strcmp(arg, "mem")) if (!MACH_IS_AMIGA || strcmp(arg, "mem"))
return 0; return 0;
...@@ -618,14 +632,16 @@ static int __init amiga_savekmsg_setup(char *arg) ...@@ -618,14 +632,16 @@ static int __init amiga_savekmsg_setup(char *arg)
/* Just steal the block, the chipram allocator isn't functional yet */ /* Just steal the block, the chipram allocator isn't functional yet */
amiga_chip_size -= SAVEKMSG_MAXMEM; amiga_chip_size -= SAVEKMSG_MAXMEM;
savekmsg = (void *)ZTWO_VADDR(CHIP_PHYSADDR + amiga_chip_size); savekmsg = ZTWO_VADDR(CHIP_PHYSADDR + amiga_chip_size);
savekmsg->magic1 = SAVEKMSG_MAGIC1; savekmsg->magic1 = SAVEKMSG_MAGIC1;
savekmsg->magic2 = SAVEKMSG_MAGIC2; savekmsg->magic2 = SAVEKMSG_MAGIC2;
savekmsg->magicptr = ZTWO_PADDR(savekmsg); savekmsg->magicptr = ZTWO_PADDR(savekmsg);
savekmsg->size = 0; savekmsg->size = 0;
registered = !!amiga_console_driver.write;
amiga_console_driver.write = amiga_mem_console_write; amiga_console_driver.write = amiga_mem_console_write;
register_console(&amiga_console_driver); if (!registered)
register_console(&amiga_console_driver);
return 0; return 0;
} }
...@@ -707,11 +723,16 @@ void amiga_serial_gets(struct console *co, char *s, int len) ...@@ -707,11 +723,16 @@ void amiga_serial_gets(struct console *co, char *s, int len)
static int __init amiga_debug_setup(char *arg) static int __init amiga_debug_setup(char *arg)
{ {
if (MACH_IS_AMIGA && !strcmp(arg, "ser")) { bool registered;
/* no initialization required (?) */
amiga_console_driver.write = amiga_serial_console_write; if (!MACH_IS_AMIGA || strcmp(arg, "ser"))
return 0;
/* no initialization required (?) */
registered = !!amiga_console_driver.write;
amiga_console_driver.write = amiga_serial_console_write;
if (!registered)
register_console(&amiga_console_driver); register_console(&amiga_console_driver);
}
return 0; return 0;
} }
......
arch/m68k/amiga/platform.c
View file @ 8cf7a16e
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <asm/amigahw.h> #include <asm/amigahw.h>
#include <asm/amigayle.h> #include <asm/amigayle.h>
#include <asm/byteorder.h>
#ifdef CONFIG_ZORRO #ifdef CONFIG_ZORRO
...@@ -66,10 +67,12 @@ static int __init z_dev_present(zorro_id id) ...@@ -66,10 +67,12 @@ static int __init z_dev_present(zorro_id id)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < zorro_num_autocon; i++) for (i = 0; i < zorro_num_autocon; i++) {
if (zorro_autocon[i].rom.er_Manufacturer == ZORRO_MANUF(id) && const struct ExpansionRom *rom = &zorro_autocon_init[i].rom;
zorro_autocon[i].rom.er_Product == ZORRO_PROD(id)) if (be16_to_cpu(rom->er_Manufacturer) == ZORRO_MANUF(id) &&
rom->er_Product == ZORRO_PROD(id))
return 1; return 1;
}
return 0; return 0;
} }
......
arch/m68k/apollo/config.c
View file @ 8cf7a16e
#include <linux/init.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mm.h> #include <linux/mm.h>
...@@ -9,6 +10,8 @@ ...@@ -9,6 +10,8 @@
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/bootinfo-apollo.h>
#include <asm/byteorder.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/apollohw.h> #include <asm/apollohw.h>
#include <asm/irq.h> #include <asm/irq.h>
...@@ -43,26 +46,25 @@ static const char *apollo_models[] = { ...@@ -43,26 +46,25 @@ static const char *apollo_models[] = {
[APOLLO_DN4500-APOLLO_DN3000] = "DN4500 (Roadrunner)" [APOLLO_DN4500-APOLLO_DN3000] = "DN4500 (Roadrunner)"
}; };
int apollo_parse_bootinfo(const struct bi_record *record) { int __init apollo_parse_bootinfo(const struct bi_record *record)
{
int unknown = 0; int unknown = 0;
const unsigned long *data = record->data; const void *data = record->data;
switch(record->tag) { switch (be16_to_cpu(record->tag)) {
case BI_APOLLO_MODEL: case BI_APOLLO_MODEL:
apollo_model=*data; apollo_model = be32_to_cpup(data);
break; break;
default: default:
unknown=1; unknown=1;
} }
return unknown; return unknown;
} }
void dn_setup_model(void) { static void __init dn_setup_model(void)
{
printk("Apollo hardware found: "); printk("Apollo hardware found: ");
printk("[%s]\n", apollo_models[apollo_model - APOLLO_DN3000]); printk("[%s]\n", apollo_models[apollo_model - APOLLO_DN3000]);
......
arch/m68k/atari/ataints.c
View file @ 8cf7a16e
...@@ -333,6 +333,9 @@ void __init atari_init_IRQ(void) ...@@ -333,6 +333,9 @@ void __init atari_init_IRQ(void)
m68k_setup_irq_controller(&atari_mfptimer_chip, handle_simple_irq, m68k_setup_irq_controller(&atari_mfptimer_chip, handle_simple_irq,
IRQ_MFP_TIMER1, 8); IRQ_MFP_TIMER1, 8);
irq_set_status_flags(IRQ_MFP_TIMER1, IRQ_IS_POLLED);
irq_set_status_flags(IRQ_MFP_TIMER2, IRQ_IS_POLLED);
/* prepare timer D data for use as poll interrupt */ /* prepare timer D data for use as poll interrupt */
/* set Timer D data Register - needs to be > 0 */ /* set Timer D data Register - needs to be > 0 */
st_mfp.tim_dt_d = 254; /* < 100 Hz */ st_mfp.tim_dt_d = 254; /* < 100 Hz */
......
arch/m68k/atari/config.c
View file @ 8cf7a16e
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
#include <linux/module.h> #include <linux/module.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/bootinfo-atari.h>
#include <asm/byteorder.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/atarihw.h> #include <asm/atarihw.h>
#include <asm/atariints.h> #include <asm/atariints.h>
...@@ -129,14 +131,14 @@ static int __init scc_test(volatile char *ctla) ...@@ -129,14 +131,14 @@ static int __init scc_test(volatile char *ctla)
int __init atari_parse_bootinfo(const struct bi_record *record) int __init atari_parse_bootinfo(const struct bi_record *record)
{ {
int unknown = 0; int unknown = 0;
const u_long *data = record->data; const void *data = record->data;
switch (record->tag) { switch (be16_to_cpu(record->tag)) {
case BI_ATARI_MCH_COOKIE: case BI_ATARI_MCH_COOKIE:
atari_mch_cookie = *data; atari_mch_cookie = be32_to_cpup(data);
break; break;
case BI_ATARI_MCH_TYPE: case BI_ATARI_MCH_TYPE:
atari_mch_type = *data; atari_mch_type = be32_to_cpup(data);
break; break;
default: default:
unknown = 1; unknown = 1;
......
arch/m68k/atari/debug.c
View file @ 8cf7a16e
...@@ -287,6 +287,8 @@ static void __init atari_init_midi_port(int cflag) ...@@ -287,6 +287,8 @@ static void __init atari_init_midi_port(int cflag)
static int __init atari_debug_setup(char *arg) static int __init atari_debug_setup(char *arg)
{ {
bool registered;
if (!MACH_IS_ATARI) if (!MACH_IS_ATARI)
return 0; return 0;
...@@ -294,6 +296,7 @@ static int __init atari_debug_setup(char *arg) ...@@ -294,6 +296,7 @@ static int __init atari_debug_setup(char *arg)
/* defaults to ser2 for a Falcon and ser1 otherwise */ /* defaults to ser2 for a Falcon and ser1 otherwise */
arg = MACH_IS_FALCON ? "ser2" : "ser1"; arg = MACH_IS_FALCON ? "ser2" : "ser1";
registered = !!atari_console_driver.write;
if (!strcmp(arg, "ser1")) { if (!strcmp(arg, "ser1")) {
/* ST-MFP Modem1 serial port */ /* ST-MFP Modem1 serial port */
atari_init_mfp_port(B9600|CS8); atari_init_mfp_port(B9600|CS8);
...@@ -317,7 +320,7 @@ static int __init atari_debug_setup(char *arg) ...@@ -317,7 +320,7 @@ static int __init atari_debug_setup(char *arg)
sound_ym.wd_data = sound_ym.rd_data_reg_sel | 0x20; /* strobe H */ sound_ym.wd_data = sound_ym.rd_data_reg_sel | 0x20; /* strobe H */
atari_console_driver.write = atari_par_console_write; atari_console_driver.write = atari_par_console_write;
} }
if (atari_console_driver.write) if (atari_console_driver.write && !registered)
register_console(&atari_console_driver); register_console(&atari_console_driver);
return 0; return 0;
......
arch/m68k/bvme6000/config.c
View file @ 8cf7a16e
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
#include <linux/bcd.h> #include <linux/bcd.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/bootinfo-vme.h>
#include <asm/byteorder.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/irq.h> #include <asm/irq.h>
...@@ -50,9 +52,9 @@ void bvme6000_set_vectors (void); ...@@ -50,9 +52,9 @@ void bvme6000_set_vectors (void);
static irq_handler_t tick_handler; static irq_handler_t tick_handler;
int bvme6000_parse_bootinfo(const struct bi_record *bi) int __init bvme6000_parse_bootinfo(const struct bi_record *bi)
{ {
if (bi->tag == BI_VME_TYPE) if (be16_to_cpu(bi->tag) == BI_VME_TYPE)
return 0; return 0;
else else
return 1; return 1;
......
arch/m68k/configs/amiga_defconfig
View file @ 8cf7a16e
...@@ -52,7 +52,6 @@ CONFIG_IP_PNP_RARP=y ...@@ -52,7 +52,6 @@ CONFIG_IP_PNP_RARP=y
CONFIG_NET_IPIP=m CONFIG_NET_IPIP=m
CONFIG_NET_IPGRE_DEMUX=m CONFIG_NET_IPGRE_DEMUX=m
CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE=m
CONFIG_SYN_COOKIES=y
CONFIG_NET_IPVTI=m CONFIG_NET_IPVTI=m
CONFIG_INET_AH=m CONFIG_INET_AH=m
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
...@@ -63,11 +62,11 @@ CONFIG_INET_XFRM_MODE_BEET=m ...@@ -63,11 +62,11 @@ CONFIG_INET_XFRM_MODE_BEET=m
# CONFIG_INET_LRO is not set # CONFIG_INET_LRO is not set
CONFIG_INET_DIAG=m CONFIG_INET_DIAG=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTER_PREF=y
CONFIG_INET6_AH=m CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m CONFIG_INET6_ESP=m
CONFIG_INET6_IPCOMP=m CONFIG_INET6_IPCOMP=m
CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
...@@ -85,6 +84,17 @@ CONFIG_NF_CONNTRACK_PPTP=m ...@@ -85,6 +84,17 @@ CONFIG_NF_CONNTRACK_PPTP=m
CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_CT=m
CONFIG_NFT_RBTREE=m
CONFIG_NFT_HASH=m
CONFIG_NFT_COUNTER=m
CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m
CONFIG_NFT_NAT=m
CONFIG_NFT_COMPAT=m
CONFIG_NETFILTER_XT_SET=m CONFIG_NETFILTER_XT_SET=m
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
...@@ -98,6 +108,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m ...@@ -98,6 +108,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TEE=m
CONFIG_NETFILTER_XT_TARGET_TPROXY=m
CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_TRACE=m
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
...@@ -130,6 +141,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m ...@@ -130,6 +141,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
CONFIG_NETFILTER_XT_MATCH_REALM=m CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_RECENT=m CONFIG_NETFILTER_XT_MATCH_RECENT=m
CONFIG_NETFILTER_XT_MATCH_SOCKET=m
CONFIG_NETFILTER_XT_MATCH_STATE=m CONFIG_NETFILTER_XT_MATCH_STATE=m
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_STRING=m
...@@ -144,11 +156,18 @@ CONFIG_IP_SET_HASH_IP=m ...@@ -144,11 +156,18 @@ CONFIG_IP_SET_HASH_IP=m
CONFIG_IP_SET_HASH_IPPORT=m CONFIG_IP_SET_HASH_IPPORT=m
CONFIG_IP_SET_HASH_IPPORTIP=m CONFIG_IP_SET_HASH_IPPORTIP=m
CONFIG_IP_SET_HASH_IPPORTNET=m CONFIG_IP_SET_HASH_IPPORTNET=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m CONFIG_IP_SET_HASH_NET=m
CONFIG_IP_SET_HASH_NETNET=m
CONFIG_IP_SET_HASH_NETPORT=m CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_TABLES_IPV4=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_NAT_IPV4=m
CONFIG_NF_TABLES_ARP=m
CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m CONFIG_IP_NF_MATCH_ECN=m
...@@ -156,6 +175,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m ...@@ -156,6 +175,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_NF_NAT_IPV4=m CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_MASQUERADE=m
...@@ -170,6 +190,9 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -170,6 +190,9 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_MATCH_EUI64=m
...@@ -183,11 +206,13 @@ CONFIG_IP6_NF_MATCH_RT=m ...@@ -183,11 +206,13 @@ CONFIG_IP6_NF_MATCH_RT=m
CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_HL=m
CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_RAW=m
CONFIG_NF_NAT_IPV6=m CONFIG_NF_NAT_IPV6=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=m
CONFIG_IP_DCCP=m CONFIG_IP_DCCP=m
# CONFIG_IP_DCCP_CCID3 is not set # CONFIG_IP_DCCP_CCID3 is not set
CONFIG_SCTP_COOKIE_HMAC_SHA1=y CONFIG_SCTP_COOKIE_HMAC_SHA1=y
...@@ -195,10 +220,13 @@ CONFIG_RDS=m ...@@ -195,10 +220,13 @@ CONFIG_RDS=m
CONFIG_RDS_TCP=m CONFIG_RDS_TCP=m
CONFIG_L2TP=m CONFIG_L2TP=m
CONFIG_ATALK=m CONFIG_ATALK=m
CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y
CONFIG_NETLINK_DIAG=m
CONFIG_NET_MPLS_GSO=m
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
# CONFIG_FIRMWARE_IN_KERNEL is not set # CONFIG_FIRMWARE_IN_KERNEL is not set
# CONFIG_FW_LOADER_USER_HELPER is not set # CONFIG_FW_LOADER_USER_HELPER is not set
...@@ -216,6 +244,7 @@ CONFIG_BLK_DEV_NBD=m ...@@ -216,6 +244,7 @@ CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD=m
CONFIG_ATA_OVER_ETH=m CONFIG_ATA_OVER_ETH=m
CONFIG_DUMMY_IRQ=m
CONFIG_IDE=y CONFIG_IDE=y
CONFIG_IDE_GD_ATAPI=y CONFIG_IDE_GD_ATAPI=y
CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_IDECD=y
...@@ -262,6 +291,7 @@ CONFIG_EQUALIZER=m ...@@ -262,6 +291,7 @@ CONFIG_EQUALIZER=m
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
CONFIG_NET_TEAM_MODE_RANDOM=m
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
...@@ -271,10 +301,10 @@ CONFIG_VETH=m ...@@ -271,10 +301,10 @@ CONFIG_VETH=m
# CONFIG_NET_VENDOR_3COM is not set # CONFIG_NET_VENDOR_3COM is not set
CONFIG_A2065=y CONFIG_A2065=y
CONFIG_ARIADNE=y CONFIG_ARIADNE=y
# CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set # CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_VENDOR_CIRRUS is not set # CONFIG_NET_VENDOR_CIRRUS is not set
# CONFIG_NET_VENDOR_FUJITSU is not set
# CONFIG_NET_VENDOR_HP is not set # CONFIG_NET_VENDOR_HP is not set
# CONFIG_NET_VENDOR_INTEL is not set # CONFIG_NET_VENDOR_INTEL is not set
# CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MARVELL is not set
...@@ -285,6 +315,7 @@ CONFIG_ZORRO8390=y ...@@ -285,6 +315,7 @@ CONFIG_ZORRO8390=y
# CONFIG_NET_VENDOR_SEEQ is not set # CONFIG_NET_VENDOR_SEEQ is not set
# CONFIG_NET_VENDOR_SMSC is not set # CONFIG_NET_VENDOR_SMSC is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
...@@ -311,7 +342,6 @@ CONFIG_JOYSTICK_AMIGA=m ...@@ -311,7 +342,6 @@ CONFIG_JOYSTICK_AMIGA=m
CONFIG_INPUT_MISC=y CONFIG_INPUT_MISC=y
CONFIG_INPUT_M68K_BEEP=m CONFIG_INPUT_M68K_BEEP=m
# CONFIG_SERIO is not set # CONFIG_SERIO is not set
CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set # CONFIG_DEVKMEM is not set
CONFIG_PRINTER=m CONFIG_PRINTER=m
...@@ -345,10 +375,6 @@ CONFIG_HEARTBEAT=y ...@@ -345,10 +375,6 @@ CONFIG_HEARTBEAT=y
CONFIG_PROC_HARDWARE=y CONFIG_PROC_HARDWARE=y
CONFIG_AMIGA_BUILTIN_SERIAL=y CONFIG_AMIGA_BUILTIN_SERIAL=y
CONFIG_SERIAL_CONSOLE=y CONFIG_SERIAL_CONSOLE=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
# CONFIG_EXT3_FS_XATTR is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -385,7 +411,7 @@ CONFIG_QNX6FS_FS=m ...@@ -385,7 +411,7 @@ CONFIG_QNX6FS_FS=m
CONFIG_SYSV_FS=m CONFIG_SYSV_FS=m
CONFIG_UFS_FS=m CONFIG_UFS_FS=m
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
CONFIG_NFS_V4=y CONFIG_NFS_V4=m
CONFIG_NFS_SWAP=y CONFIG_NFS_SWAP=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
...@@ -444,10 +470,10 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -444,10 +470,10 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_STRING_HELPERS=m
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_NULL=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_CCM=m
...@@ -480,6 +506,8 @@ CONFIG_CRYPTO_TEA=m ...@@ -480,6 +506,8 @@ CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_ZLIB=m CONFIG_CRYPTO_ZLIB=m
CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m
# CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
......
arch/m68k/configs/apollo_defconfig
View file @ 8cf7a16e
...@@ -50,7 +50,6 @@ CONFIG_IP_PNP_RARP=y ...@@ -50,7 +50,6 @@ CONFIG_IP_PNP_RARP=y
CONFIG_NET_IPIP=m CONFIG_NET_IPIP=m
CONFIG_NET_IPGRE_DEMUX=m CONFIG_NET_IPGRE_DEMUX=m
CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE=m
CONFIG_SYN_COOKIES=y
CONFIG_NET_IPVTI=m CONFIG_NET_IPVTI=m
CONFIG_INET_AH=m CONFIG_INET_AH=m
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
...@@ -61,11 +60,11 @@ CONFIG_INET_XFRM_MODE_BEET=m ...@@ -61,11 +60,11 @@ CONFIG_INET_XFRM_MODE_BEET=m
# CONFIG_INET_LRO is not set # CONFIG_INET_LRO is not set
CONFIG_INET_DIAG=m CONFIG_INET_DIAG=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTER_PREF=y
CONFIG_INET6_AH=m CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m CONFIG_INET6_ESP=m
CONFIG_INET6_IPCOMP=m CONFIG_INET6_IPCOMP=m
CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
...@@ -83,6 +82,17 @@ CONFIG_NF_CONNTRACK_PPTP=m ...@@ -83,6 +82,17 @@ CONFIG_NF_CONNTRACK_PPTP=m
CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_CT=m
CONFIG_NFT_RBTREE=m
CONFIG_NFT_HASH=m
CONFIG_NFT_COUNTER=m
CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m
CONFIG_NFT_NAT=m
CONFIG_NFT_COMPAT=m
CONFIG_NETFILTER_XT_SET=m CONFIG_NETFILTER_XT_SET=m
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
...@@ -96,6 +106,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m ...@@ -96,6 +106,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TEE=m
CONFIG_NETFILTER_XT_TARGET_TPROXY=m
CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_TRACE=m
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
...@@ -128,6 +139,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m ...@@ -128,6 +139,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
CONFIG_NETFILTER_XT_MATCH_REALM=m CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_RECENT=m CONFIG_NETFILTER_XT_MATCH_RECENT=m
CONFIG_NETFILTER_XT_MATCH_SOCKET=m
CONFIG_NETFILTER_XT_MATCH_STATE=m CONFIG_NETFILTER_XT_MATCH_STATE=m
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_STRING=m
...@@ -142,11 +154,18 @@ CONFIG_IP_SET_HASH_IP=m ...@@ -142,11 +154,18 @@ CONFIG_IP_SET_HASH_IP=m
CONFIG_IP_SET_HASH_IPPORT=m CONFIG_IP_SET_HASH_IPPORT=m
CONFIG_IP_SET_HASH_IPPORTIP=m CONFIG_IP_SET_HASH_IPPORTIP=m
CONFIG_IP_SET_HASH_IPPORTNET=m CONFIG_IP_SET_HASH_IPPORTNET=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m CONFIG_IP_SET_HASH_NET=m
CONFIG_IP_SET_HASH_NETNET=m
CONFIG_IP_SET_HASH_NETPORT=m CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_TABLES_IPV4=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_NAT_IPV4=m
CONFIG_NF_TABLES_ARP=m
CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m CONFIG_IP_NF_MATCH_ECN=m
...@@ -154,6 +173,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m ...@@ -154,6 +173,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_NF_NAT_IPV4=m CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_MASQUERADE=m
...@@ -168,6 +188,9 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -168,6 +188,9 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_MATCH_EUI64=m
...@@ -181,11 +204,13 @@ CONFIG_IP6_NF_MATCH_RT=m ...@@ -181,11 +204,13 @@ CONFIG_IP6_NF_MATCH_RT=m
CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_HL=m
CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_RAW=m
CONFIG_NF_NAT_IPV6=m CONFIG_NF_NAT_IPV6=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=m
CONFIG_IP_DCCP=m CONFIG_IP_DCCP=m
# CONFIG_IP_DCCP_CCID3 is not set # CONFIG_IP_DCCP_CCID3 is not set
CONFIG_SCTP_COOKIE_HMAC_SHA1=y CONFIG_SCTP_COOKIE_HMAC_SHA1=y
...@@ -193,10 +218,13 @@ CONFIG_RDS=m ...@@ -193,10 +218,13 @@ CONFIG_RDS=m
CONFIG_RDS_TCP=m CONFIG_RDS_TCP=m
CONFIG_L2TP=m CONFIG_L2TP=m
CONFIG_ATALK=m CONFIG_ATALK=m
CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y
CONFIG_NETLINK_DIAG=m
CONFIG_NET_MPLS_GSO=m
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
# CONFIG_FIRMWARE_IN_KERNEL is not set # CONFIG_FIRMWARE_IN_KERNEL is not set
# CONFIG_FW_LOADER_USER_HELPER is not set # CONFIG_FW_LOADER_USER_HELPER is not set
...@@ -208,6 +236,7 @@ CONFIG_BLK_DEV_NBD=m ...@@ -208,6 +236,7 @@ CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD=m
CONFIG_ATA_OVER_ETH=m CONFIG_ATA_OVER_ETH=m
CONFIG_DUMMY_IRQ=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_SCSI_TGT=m CONFIG_SCSI_TGT=m
...@@ -244,12 +273,14 @@ CONFIG_EQUALIZER=m ...@@ -244,12 +273,14 @@ CONFIG_EQUALIZER=m
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
CONFIG_NET_TEAM_MODE_RANDOM=m
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE=m
CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETCONSOLE_DYNAMIC=y
CONFIG_VETH=m CONFIG_VETH=m
# CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set # CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_VENDOR_INTEL is not set # CONFIG_NET_VENDOR_INTEL is not set
...@@ -258,6 +289,7 @@ CONFIG_VETH=m ...@@ -258,6 +289,7 @@ CONFIG_VETH=m
# CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_NATSEMI is not set
# CONFIG_NET_VENDOR_SEEQ is not set # CONFIG_NET_VENDOR_SEEQ is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
...@@ -279,7 +311,6 @@ CONFIG_INPUT_EVDEV=m ...@@ -279,7 +311,6 @@ CONFIG_INPUT_EVDEV=m
# CONFIG_MOUSE_PS2 is not set # CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_SERIAL=m
CONFIG_SERIO=m CONFIG_SERIO=m
CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set # CONFIG_DEVKMEM is not set
# CONFIG_HW_RANDOM is not set # CONFIG_HW_RANDOM is not set
...@@ -302,10 +333,6 @@ CONFIG_RTC_DRV_GENERIC=m ...@@ -302,10 +333,6 @@ CONFIG_RTC_DRV_GENERIC=m
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_HEARTBEAT=y CONFIG_HEARTBEAT=y
CONFIG_PROC_HARDWARE=y CONFIG_PROC_HARDWARE=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
# CONFIG_EXT3_FS_XATTR is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -342,7 +369,7 @@ CONFIG_QNX6FS_FS=m ...@@ -342,7 +369,7 @@ CONFIG_QNX6FS_FS=m
CONFIG_SYSV_FS=m CONFIG_SYSV_FS=m
CONFIG_UFS_FS=m CONFIG_UFS_FS=m
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
CONFIG_NFS_V4=y CONFIG_NFS_V4=m
CONFIG_NFS_SWAP=y CONFIG_NFS_SWAP=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
...@@ -401,10 +428,10 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -401,10 +428,10 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_STRING_HELPERS=m
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_NULL=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_CCM=m
...@@ -437,6 +464,8 @@ CONFIG_CRYPTO_TEA=m ...@@ -437,6 +464,8 @@ CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_ZLIB=m CONFIG_CRYPTO_ZLIB=m
CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m
# CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
......
arch/m68k/configs/atari_defconfig
View file @ 8cf7a16e
...@@ -49,7 +49,6 @@ CONFIG_IP_PNP_RARP=y ...@@ -49,7 +49,6 @@ CONFIG_IP_PNP_RARP=y
CONFIG_NET_IPIP=m CONFIG_NET_IPIP=m
CONFIG_NET_IPGRE_DEMUX=m CONFIG_NET_IPGRE_DEMUX=m
CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE=m
CONFIG_SYN_COOKIES=y
CONFIG_NET_IPVTI=m CONFIG_NET_IPVTI=m
CONFIG_INET_AH=m CONFIG_INET_AH=m
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
...@@ -60,11 +59,11 @@ CONFIG_INET_XFRM_MODE_BEET=m ...@@ -60,11 +59,11 @@ CONFIG_INET_XFRM_MODE_BEET=m
# CONFIG_INET_LRO is not set # CONFIG_INET_LRO is not set
CONFIG_INET_DIAG=m CONFIG_INET_DIAG=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTER_PREF=y
CONFIG_INET6_AH=m CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m CONFIG_INET6_ESP=m
CONFIG_INET6_IPCOMP=m CONFIG_INET6_IPCOMP=m
CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
...@@ -82,6 +81,17 @@ CONFIG_NF_CONNTRACK_PPTP=m ...@@ -82,6 +81,17 @@ CONFIG_NF_CONNTRACK_PPTP=m
CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_CT=m
CONFIG_NFT_RBTREE=m
CONFIG_NFT_HASH=m
CONFIG_NFT_COUNTER=m
CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m
CONFIG_NFT_NAT=m
CONFIG_NFT_COMPAT=m
CONFIG_NETFILTER_XT_SET=m CONFIG_NETFILTER_XT_SET=m
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
...@@ -95,6 +105,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m ...@@ -95,6 +105,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TEE=m
CONFIG_NETFILTER_XT_TARGET_TPROXY=m
CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_TRACE=m
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
...@@ -127,6 +138,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m ...@@ -127,6 +138,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
CONFIG_NETFILTER_XT_MATCH_REALM=m CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_RECENT=m CONFIG_NETFILTER_XT_MATCH_RECENT=m
CONFIG_NETFILTER_XT_MATCH_SOCKET=m
CONFIG_NETFILTER_XT_MATCH_STATE=m CONFIG_NETFILTER_XT_MATCH_STATE=m
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_STRING=m
...@@ -141,11 +153,18 @@ CONFIG_IP_SET_HASH_IP=m ...@@ -141,11 +153,18 @@ CONFIG_IP_SET_HASH_IP=m
CONFIG_IP_SET_HASH_IPPORT=m CONFIG_IP_SET_HASH_IPPORT=m
CONFIG_IP_SET_HASH_IPPORTIP=m CONFIG_IP_SET_HASH_IPPORTIP=m
CONFIG_IP_SET_HASH_IPPORTNET=m CONFIG_IP_SET_HASH_IPPORTNET=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m CONFIG_IP_SET_HASH_NET=m
CONFIG_IP_SET_HASH_NETNET=m
CONFIG_IP_SET_HASH_NETPORT=m CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_TABLES_IPV4=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_NAT_IPV4=m
CONFIG_NF_TABLES_ARP=m
CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m CONFIG_IP_NF_MATCH_ECN=m
...@@ -153,6 +172,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m ...@@ -153,6 +172,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_NF_NAT_IPV4=m CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_MASQUERADE=m
...@@ -167,6 +187,9 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -167,6 +187,9 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_MATCH_EUI64=m
...@@ -180,11 +203,13 @@ CONFIG_IP6_NF_MATCH_RT=m ...@@ -180,11 +203,13 @@ CONFIG_IP6_NF_MATCH_RT=m
CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_HL=m
CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_RAW=m
CONFIG_NF_NAT_IPV6=m CONFIG_NF_NAT_IPV6=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=m
CONFIG_IP_DCCP=m CONFIG_IP_DCCP=m
# CONFIG_IP_DCCP_CCID3 is not set # CONFIG_IP_DCCP_CCID3 is not set
CONFIG_SCTP_COOKIE_HMAC_SHA1=y CONFIG_SCTP_COOKIE_HMAC_SHA1=y
...@@ -192,10 +217,13 @@ CONFIG_RDS=m ...@@ -192,10 +217,13 @@ CONFIG_RDS=m
CONFIG_RDS_TCP=m CONFIG_RDS_TCP=m
CONFIG_L2TP=m CONFIG_L2TP=m
CONFIG_ATALK=m CONFIG_ATALK=m
CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y
CONFIG_NETLINK_DIAG=m
CONFIG_NET_MPLS_GSO=m
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
# CONFIG_FIRMWARE_IN_KERNEL is not set # CONFIG_FIRMWARE_IN_KERNEL is not set
# CONFIG_FW_LOADER_USER_HELPER is not set # CONFIG_FW_LOADER_USER_HELPER is not set
...@@ -211,6 +239,7 @@ CONFIG_BLK_DEV_NBD=m ...@@ -211,6 +239,7 @@ CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD=m
CONFIG_ATA_OVER_ETH=m CONFIG_ATA_OVER_ETH=m
CONFIG_DUMMY_IRQ=m
CONFIG_IDE=y CONFIG_IDE=y
CONFIG_IDE_GD_ATAPI=y CONFIG_IDE_GD_ATAPI=y
CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_IDECD=y
...@@ -249,10 +278,10 @@ CONFIG_TCM_PSCSI=m ...@@ -249,10 +278,10 @@ CONFIG_TCM_PSCSI=m
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_DUMMY=m CONFIG_DUMMY=m
CONFIG_EQUALIZER=m CONFIG_EQUALIZER=m
CONFIG_MII=y
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
CONFIG_NET_TEAM_MODE_RANDOM=m
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
...@@ -260,6 +289,7 @@ CONFIG_NETCONSOLE=m ...@@ -260,6 +289,7 @@ CONFIG_NETCONSOLE=m
CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETCONSOLE_DYNAMIC=y
CONFIG_VETH=m CONFIG_VETH=m
CONFIG_ATARILANCE=y CONFIG_ATARILANCE=y
# CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set # CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_VENDOR_INTEL is not set # CONFIG_NET_VENDOR_INTEL is not set
...@@ -267,6 +297,7 @@ CONFIG_ATARILANCE=y ...@@ -267,6 +297,7 @@ CONFIG_ATARILANCE=y
# CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICREL is not set
# CONFIG_NET_VENDOR_SEEQ is not set # CONFIG_NET_VENDOR_SEEQ is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
...@@ -291,7 +322,6 @@ CONFIG_MOUSE_ATARI=m ...@@ -291,7 +322,6 @@ CONFIG_MOUSE_ATARI=m
CONFIG_INPUT_MISC=y CONFIG_INPUT_MISC=y
CONFIG_INPUT_M68K_BEEP=m CONFIG_INPUT_M68K_BEEP=m
# CONFIG_SERIO is not set # CONFIG_SERIO is not set
CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set # CONFIG_DEVKMEM is not set
CONFIG_PRINTER=m CONFIG_PRINTER=m
...@@ -320,10 +350,6 @@ CONFIG_NFBLOCK=y ...@@ -320,10 +350,6 @@ CONFIG_NFBLOCK=y
CONFIG_NFCON=y CONFIG_NFCON=y
CONFIG_NFETH=y CONFIG_NFETH=y
CONFIG_ATARI_DSP56K=m CONFIG_ATARI_DSP56K=m
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
# CONFIG_EXT3_FS_XATTR is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -360,7 +386,7 @@ CONFIG_QNX6FS_FS=m ...@@ -360,7 +386,7 @@ CONFIG_QNX6FS_FS=m
CONFIG_SYSV_FS=m CONFIG_SYSV_FS=m
CONFIG_UFS_FS=m CONFIG_UFS_FS=m
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
CONFIG_NFS_V4=y CONFIG_NFS_V4=m
CONFIG_NFS_SWAP=y CONFIG_NFS_SWAP=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
...@@ -419,10 +445,10 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -419,10 +445,10 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_STRING_HELPERS=m
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_NULL=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_CCM=m
...@@ -455,6 +481,8 @@ CONFIG_CRYPTO_TEA=m ...@@ -455,6 +481,8 @@ CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_ZLIB=m CONFIG_CRYPTO_ZLIB=m
CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m
# CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
......
arch/m68k/configs/bvme6000_defconfig
View file @ 8cf7a16e
...@@ -48,7 +48,6 @@ CONFIG_IP_PNP_RARP=y ...@@ -48,7 +48,6 @@ CONFIG_IP_PNP_RARP=y
CONFIG_NET_IPIP=m CONFIG_NET_IPIP=m
CONFIG_NET_IPGRE_DEMUX=m CONFIG_NET_IPGRE_DEMUX=m
CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE=m
CONFIG_SYN_COOKIES=y
CONFIG_NET_IPVTI=m CONFIG_NET_IPVTI=m
CONFIG_INET_AH=m CONFIG_INET_AH=m
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
...@@ -59,11 +58,11 @@ CONFIG_INET_XFRM_MODE_BEET=m ...@@ -59,11 +58,11 @@ CONFIG_INET_XFRM_MODE_BEET=m
# CONFIG_INET_LRO is not set # CONFIG_INET_LRO is not set
CONFIG_INET_DIAG=m CONFIG_INET_DIAG=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTER_PREF=y
CONFIG_INET6_AH=m CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m CONFIG_INET6_ESP=m
CONFIG_INET6_IPCOMP=m CONFIG_INET6_IPCOMP=m
CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
...@@ -81,6 +80,17 @@ CONFIG_NF_CONNTRACK_PPTP=m ...@@ -81,6 +80,17 @@ CONFIG_NF_CONNTRACK_PPTP=m
CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_CT=m
CONFIG_NFT_RBTREE=m
CONFIG_NFT_HASH=m
CONFIG_NFT_COUNTER=m
CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m
CONFIG_NFT_NAT=m
CONFIG_NFT_COMPAT=m
CONFIG_NETFILTER_XT_SET=m CONFIG_NETFILTER_XT_SET=m
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
...@@ -94,6 +104,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m ...@@ -94,6 +104,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TEE=m
CONFIG_NETFILTER_XT_TARGET_TPROXY=m
CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_TRACE=m
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
...@@ -126,6 +137,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m ...@@ -126,6 +137,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
CONFIG_NETFILTER_XT_MATCH_REALM=m CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_RECENT=m CONFIG_NETFILTER_XT_MATCH_RECENT=m
CONFIG_NETFILTER_XT_MATCH_SOCKET=m
CONFIG_NETFILTER_XT_MATCH_STATE=m CONFIG_NETFILTER_XT_MATCH_STATE=m
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_STRING=m
...@@ -140,11 +152,18 @@ CONFIG_IP_SET_HASH_IP=m ...@@ -140,11 +152,18 @@ CONFIG_IP_SET_HASH_IP=m
CONFIG_IP_SET_HASH_IPPORT=m CONFIG_IP_SET_HASH_IPPORT=m
CONFIG_IP_SET_HASH_IPPORTIP=m CONFIG_IP_SET_HASH_IPPORTIP=m
CONFIG_IP_SET_HASH_IPPORTNET=m CONFIG_IP_SET_HASH_IPPORTNET=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m CONFIG_IP_SET_HASH_NET=m
CONFIG_IP_SET_HASH_NETNET=m
CONFIG_IP_SET_HASH_NETPORT=m CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_TABLES_IPV4=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_NAT_IPV4=m
CONFIG_NF_TABLES_ARP=m
CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m CONFIG_IP_NF_MATCH_ECN=m
...@@ -152,6 +171,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m ...@@ -152,6 +171,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_NF_NAT_IPV4=m CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_MASQUERADE=m
...@@ -166,6 +186,9 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -166,6 +186,9 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_MATCH_EUI64=m
...@@ -179,11 +202,13 @@ CONFIG_IP6_NF_MATCH_RT=m ...@@ -179,11 +202,13 @@ CONFIG_IP6_NF_MATCH_RT=m
CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_HL=m
CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_RAW=m
CONFIG_NF_NAT_IPV6=m CONFIG_NF_NAT_IPV6=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=m
CONFIG_IP_DCCP=m CONFIG_IP_DCCP=m
# CONFIG_IP_DCCP_CCID3 is not set # CONFIG_IP_DCCP_CCID3 is not set
CONFIG_SCTP_COOKIE_HMAC_SHA1=y CONFIG_SCTP_COOKIE_HMAC_SHA1=y
...@@ -191,10 +216,13 @@ CONFIG_RDS=m ...@@ -191,10 +216,13 @@ CONFIG_RDS=m
CONFIG_RDS_TCP=m CONFIG_RDS_TCP=m
CONFIG_L2TP=m CONFIG_L2TP=m
CONFIG_ATALK=m CONFIG_ATALK=m
CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y
CONFIG_NETLINK_DIAG=m
CONFIG_NET_MPLS_GSO=m
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
# CONFIG_FIRMWARE_IN_KERNEL is not set # CONFIG_FIRMWARE_IN_KERNEL is not set
# CONFIG_FW_LOADER_USER_HELPER is not set # CONFIG_FW_LOADER_USER_HELPER is not set
...@@ -206,6 +234,7 @@ CONFIG_BLK_DEV_NBD=m ...@@ -206,6 +234,7 @@ CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD=m
CONFIG_ATA_OVER_ETH=m CONFIG_ATA_OVER_ETH=m
CONFIG_DUMMY_IRQ=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_SCSI_TGT=m CONFIG_SCSI_TGT=m
...@@ -243,12 +272,14 @@ CONFIG_EQUALIZER=m ...@@ -243,12 +272,14 @@ CONFIG_EQUALIZER=m
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
CONFIG_NET_TEAM_MODE_RANDOM=m
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE=m
CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETCONSOLE_DYNAMIC=y
CONFIG_VETH=m CONFIG_VETH=m
# CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set # CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
CONFIG_BVME6000_NET=y CONFIG_BVME6000_NET=y
...@@ -257,6 +288,7 @@ CONFIG_BVME6000_NET=y ...@@ -257,6 +288,7 @@ CONFIG_BVME6000_NET=y
# CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_NATSEMI is not set
# CONFIG_NET_VENDOR_SEEQ is not set # CONFIG_NET_VENDOR_SEEQ is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
...@@ -294,10 +326,6 @@ CONFIG_RTC_CLASS=y ...@@ -294,10 +326,6 @@ CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_GENERIC=m CONFIG_RTC_DRV_GENERIC=m
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_PROC_HARDWARE=y CONFIG_PROC_HARDWARE=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
# CONFIG_EXT3_FS_XATTR is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -334,7 +362,7 @@ CONFIG_QNX6FS_FS=m ...@@ -334,7 +362,7 @@ CONFIG_QNX6FS_FS=m
CONFIG_SYSV_FS=m CONFIG_SYSV_FS=m
CONFIG_UFS_FS=m CONFIG_UFS_FS=m
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
CONFIG_NFS_V4=y CONFIG_NFS_V4=m
CONFIG_NFS_SWAP=y CONFIG_NFS_SWAP=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
...@@ -393,10 +421,10 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -393,10 +421,10 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_STRING_HELPERS=m
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_NULL=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_CCM=m
...@@ -429,6 +457,8 @@ CONFIG_CRYPTO_TEA=m ...@@ -429,6 +457,8 @@ CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_ZLIB=m CONFIG_CRYPTO_ZLIB=m
CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m
# CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
......
arch/m68k/configs/hp300_defconfig
View file @ 8cf7a16e
...@@ -50,7 +50,6 @@ CONFIG_IP_PNP_RARP=y ...@@ -50,7 +50,6 @@ CONFIG_IP_PNP_RARP=y
CONFIG_NET_IPIP=m CONFIG_NET_IPIP=m
CONFIG_NET_IPGRE_DEMUX=m CONFIG_NET_IPGRE_DEMUX=m
CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE=m
CONFIG_SYN_COOKIES=y
CONFIG_NET_IPVTI=m CONFIG_NET_IPVTI=m
CONFIG_INET_AH=m CONFIG_INET_AH=m
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
...@@ -61,11 +60,11 @@ CONFIG_INET_XFRM_MODE_BEET=m ...@@ -61,11 +60,11 @@ CONFIG_INET_XFRM_MODE_BEET=m
# CONFIG_INET_LRO is not set # CONFIG_INET_LRO is not set
CONFIG_INET_DIAG=m CONFIG_INET_DIAG=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTER_PREF=y
CONFIG_INET6_AH=m CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m CONFIG_INET6_ESP=m
CONFIG_INET6_IPCOMP=m CONFIG_INET6_IPCOMP=m
CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
...@@ -83,6 +82,17 @@ CONFIG_NF_CONNTRACK_PPTP=m ...@@ -83,6 +82,17 @@ CONFIG_NF_CONNTRACK_PPTP=m
CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_CT=m
CONFIG_NFT_RBTREE=m
CONFIG_NFT_HASH=m
CONFIG_NFT_COUNTER=m
CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m
CONFIG_NFT_NAT=m
CONFIG_NFT_COMPAT=m
CONFIG_NETFILTER_XT_SET=m CONFIG_NETFILTER_XT_SET=m
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
...@@ -96,6 +106,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m ...@@ -96,6 +106,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TEE=m
CONFIG_NETFILTER_XT_TARGET_TPROXY=m
CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_TRACE=m
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
...@@ -128,6 +139,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m ...@@ -128,6 +139,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
CONFIG_NETFILTER_XT_MATCH_REALM=m CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_RECENT=m CONFIG_NETFILTER_XT_MATCH_RECENT=m
CONFIG_NETFILTER_XT_MATCH_SOCKET=m
CONFIG_NETFILTER_XT_MATCH_STATE=m CONFIG_NETFILTER_XT_MATCH_STATE=m
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_STRING=m
...@@ -142,11 +154,18 @@ CONFIG_IP_SET_HASH_IP=m ...@@ -142,11 +154,18 @@ CONFIG_IP_SET_HASH_IP=m
CONFIG_IP_SET_HASH_IPPORT=m CONFIG_IP_SET_HASH_IPPORT=m
CONFIG_IP_SET_HASH_IPPORTIP=m CONFIG_IP_SET_HASH_IPPORTIP=m
CONFIG_IP_SET_HASH_IPPORTNET=m CONFIG_IP_SET_HASH_IPPORTNET=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m CONFIG_IP_SET_HASH_NET=m
CONFIG_IP_SET_HASH_NETNET=m
CONFIG_IP_SET_HASH_NETPORT=m CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_TABLES_IPV4=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_NAT_IPV4=m
CONFIG_NF_TABLES_ARP=m
CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m CONFIG_IP_NF_MATCH_ECN=m
...@@ -154,6 +173,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m ...@@ -154,6 +173,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_NF_NAT_IPV4=m CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_MASQUERADE=m
...@@ -168,6 +188,9 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -168,6 +188,9 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_MATCH_EUI64=m
...@@ -181,11 +204,13 @@ CONFIG_IP6_NF_MATCH_RT=m ...@@ -181,11 +204,13 @@ CONFIG_IP6_NF_MATCH_RT=m
CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_HL=m
CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_RAW=m
CONFIG_NF_NAT_IPV6=m CONFIG_NF_NAT_IPV6=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=m
CONFIG_IP_DCCP=m CONFIG_IP_DCCP=m
# CONFIG_IP_DCCP_CCID3 is not set # CONFIG_IP_DCCP_CCID3 is not set
CONFIG_SCTP_COOKIE_HMAC_SHA1=y CONFIG_SCTP_COOKIE_HMAC_SHA1=y
...@@ -193,10 +218,13 @@ CONFIG_RDS=m ...@@ -193,10 +218,13 @@ CONFIG_RDS=m
CONFIG_RDS_TCP=m CONFIG_RDS_TCP=m
CONFIG_L2TP=m CONFIG_L2TP=m
CONFIG_ATALK=m CONFIG_ATALK=m
CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y
CONFIG_NETLINK_DIAG=m
CONFIG_NET_MPLS_GSO=m
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
# CONFIG_FIRMWARE_IN_KERNEL is not set # CONFIG_FIRMWARE_IN_KERNEL is not set
# CONFIG_FW_LOADER_USER_HELPER is not set # CONFIG_FW_LOADER_USER_HELPER is not set
...@@ -208,6 +236,7 @@ CONFIG_BLK_DEV_NBD=m ...@@ -208,6 +236,7 @@ CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD=m
CONFIG_ATA_OVER_ETH=m CONFIG_ATA_OVER_ETH=m
CONFIG_DUMMY_IRQ=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_SCSI_TGT=m CONFIG_SCSI_TGT=m
...@@ -244,6 +273,7 @@ CONFIG_EQUALIZER=m ...@@ -244,6 +273,7 @@ CONFIG_EQUALIZER=m
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
CONFIG_NET_TEAM_MODE_RANDOM=m
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
...@@ -251,6 +281,7 @@ CONFIG_NETCONSOLE=m ...@@ -251,6 +281,7 @@ CONFIG_NETCONSOLE=m
CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETCONSOLE_DYNAMIC=y
CONFIG_VETH=m CONFIG_VETH=m
CONFIG_HPLANCE=y CONFIG_HPLANCE=y
# CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set # CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_VENDOR_INTEL is not set # CONFIG_NET_VENDOR_INTEL is not set
...@@ -259,6 +290,7 @@ CONFIG_HPLANCE=y ...@@ -259,6 +290,7 @@ CONFIG_HPLANCE=y
# CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_NATSEMI is not set
# CONFIG_NET_VENDOR_SEEQ is not set # CONFIG_NET_VENDOR_SEEQ is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
...@@ -282,7 +314,6 @@ CONFIG_MOUSE_SERIAL=m ...@@ -282,7 +314,6 @@ CONFIG_MOUSE_SERIAL=m
CONFIG_INPUT_MISC=y CONFIG_INPUT_MISC=y
CONFIG_HP_SDC_RTC=m CONFIG_HP_SDC_RTC=m
CONFIG_SERIO_SERPORT=m CONFIG_SERIO_SERPORT=m
CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set # CONFIG_DEVKMEM is not set
# CONFIG_HW_RANDOM is not set # CONFIG_HW_RANDOM is not set
...@@ -304,10 +335,6 @@ CONFIG_RTC_CLASS=y ...@@ -304,10 +335,6 @@ CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_GENERIC=m CONFIG_RTC_DRV_GENERIC=m
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_PROC_HARDWARE=y CONFIG_PROC_HARDWARE=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
# CONFIG_EXT3_FS_XATTR is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -344,7 +371,7 @@ CONFIG_QNX6FS_FS=m ...@@ -344,7 +371,7 @@ CONFIG_QNX6FS_FS=m
CONFIG_SYSV_FS=m CONFIG_SYSV_FS=m
CONFIG_UFS_FS=m CONFIG_UFS_FS=m
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
CONFIG_NFS_V4=y CONFIG_NFS_V4=m
CONFIG_NFS_SWAP=y CONFIG_NFS_SWAP=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
...@@ -403,10 +430,10 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -403,10 +430,10 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_STRING_HELPERS=m
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_NULL=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_CCM=m
...@@ -439,6 +466,8 @@ CONFIG_CRYPTO_TEA=m ...@@ -439,6 +466,8 @@ CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_ZLIB=m CONFIG_CRYPTO_ZLIB=m
CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m
# CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
......
arch/m68k/configs/mac_defconfig
View file @ 8cf7a16e
...@@ -49,7 +49,6 @@ CONFIG_IP_PNP_RARP=y ...@@ -49,7 +49,6 @@ CONFIG_IP_PNP_RARP=y
CONFIG_NET_IPIP=m CONFIG_NET_IPIP=m
CONFIG_NET_IPGRE_DEMUX=m CONFIG_NET_IPGRE_DEMUX=m
CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE=m
CONFIG_SYN_COOKIES=y
CONFIG_NET_IPVTI=m CONFIG_NET_IPVTI=m
CONFIG_INET_AH=m CONFIG_INET_AH=m
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
...@@ -60,11 +59,11 @@ CONFIG_INET_XFRM_MODE_BEET=m ...@@ -60,11 +59,11 @@ CONFIG_INET_XFRM_MODE_BEET=m
# CONFIG_INET_LRO is not set # CONFIG_INET_LRO is not set
CONFIG_INET_DIAG=m CONFIG_INET_DIAG=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTER_PREF=y
CONFIG_INET6_AH=m CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m CONFIG_INET6_ESP=m
CONFIG_INET6_IPCOMP=m CONFIG_INET6_IPCOMP=m
CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
...@@ -82,6 +81,17 @@ CONFIG_NF_CONNTRACK_PPTP=m ...@@ -82,6 +81,17 @@ CONFIG_NF_CONNTRACK_PPTP=m
CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_CT=m
CONFIG_NFT_RBTREE=m
CONFIG_NFT_HASH=m
CONFIG_NFT_COUNTER=m
CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m
CONFIG_NFT_NAT=m
CONFIG_NFT_COMPAT=m
CONFIG_NETFILTER_XT_SET=m CONFIG_NETFILTER_XT_SET=m
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
...@@ -95,6 +105,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m ...@@ -95,6 +105,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TEE=m
CONFIG_NETFILTER_XT_TARGET_TPROXY=m
CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_TRACE=m
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
...@@ -127,6 +138,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m ...@@ -127,6 +138,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
CONFIG_NETFILTER_XT_MATCH_REALM=m CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_RECENT=m CONFIG_NETFILTER_XT_MATCH_RECENT=m
CONFIG_NETFILTER_XT_MATCH_SOCKET=m
CONFIG_NETFILTER_XT_MATCH_STATE=m CONFIG_NETFILTER_XT_MATCH_STATE=m
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_STRING=m
...@@ -141,11 +153,18 @@ CONFIG_IP_SET_HASH_IP=m ...@@ -141,11 +153,18 @@ CONFIG_IP_SET_HASH_IP=m
CONFIG_IP_SET_HASH_IPPORT=m CONFIG_IP_SET_HASH_IPPORT=m
CONFIG_IP_SET_HASH_IPPORTIP=m CONFIG_IP_SET_HASH_IPPORTIP=m
CONFIG_IP_SET_HASH_IPPORTNET=m CONFIG_IP_SET_HASH_IPPORTNET=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m CONFIG_IP_SET_HASH_NET=m
CONFIG_IP_SET_HASH_NETNET=m
CONFIG_IP_SET_HASH_NETPORT=m CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_TABLES_IPV4=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_NAT_IPV4=m
CONFIG_NF_TABLES_ARP=m
CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m CONFIG_IP_NF_MATCH_ECN=m
...@@ -153,6 +172,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m ...@@ -153,6 +172,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_NF_NAT_IPV4=m CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_MASQUERADE=m
...@@ -167,6 +187,9 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -167,6 +187,9 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_MATCH_EUI64=m
...@@ -180,11 +203,13 @@ CONFIG_IP6_NF_MATCH_RT=m ...@@ -180,11 +203,13 @@ CONFIG_IP6_NF_MATCH_RT=m
CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_HL=m
CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_RAW=m
CONFIG_NF_NAT_IPV6=m CONFIG_NF_NAT_IPV6=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=m
CONFIG_IP_DCCP=m CONFIG_IP_DCCP=m
# CONFIG_IP_DCCP_CCID3 is not set # CONFIG_IP_DCCP_CCID3 is not set
CONFIG_SCTP_COOKIE_HMAC_SHA1=y CONFIG_SCTP_COOKIE_HMAC_SHA1=y
...@@ -195,11 +220,13 @@ CONFIG_ATALK=m ...@@ -195,11 +220,13 @@ CONFIG_ATALK=m
CONFIG_DEV_APPLETALK=m CONFIG_DEV_APPLETALK=m
CONFIG_IPDDP=m CONFIG_IPDDP=m
CONFIG_IPDDP_ENCAP=y CONFIG_IPDDP_ENCAP=y
CONFIG_IPDDP_DECAP=y CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y
CONFIG_NETLINK_DIAG=m
CONFIG_NET_MPLS_GSO=m
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
# CONFIG_FIRMWARE_IN_KERNEL is not set # CONFIG_FIRMWARE_IN_KERNEL is not set
# CONFIG_FW_LOADER_USER_HELPER is not set # CONFIG_FW_LOADER_USER_HELPER is not set
...@@ -212,6 +239,7 @@ CONFIG_BLK_DEV_NBD=m ...@@ -212,6 +239,7 @@ CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD=m
CONFIG_ATA_OVER_ETH=m CONFIG_ATA_OVER_ETH=m
CONFIG_DUMMY_IRQ=m
CONFIG_IDE=y CONFIG_IDE=y
CONFIG_IDE_GD_ATAPI=y CONFIG_IDE_GD_ATAPI=y
CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_IDECD=y
...@@ -261,6 +289,7 @@ CONFIG_EQUALIZER=m ...@@ -261,6 +289,7 @@ CONFIG_EQUALIZER=m
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
CONFIG_NET_TEAM_MODE_RANDOM=m
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
...@@ -268,6 +297,7 @@ CONFIG_NETCONSOLE=m ...@@ -268,6 +297,7 @@ CONFIG_NETCONSOLE=m
CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETCONSOLE_DYNAMIC=y
CONFIG_VETH=m CONFIG_VETH=m
CONFIG_MACMACE=y CONFIG_MACMACE=y
# CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set # CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
CONFIG_MAC89x0=y CONFIG_MAC89x0=y
...@@ -279,6 +309,7 @@ CONFIG_MAC8390=y ...@@ -279,6 +309,7 @@ CONFIG_MAC8390=y
# CONFIG_NET_VENDOR_SEEQ is not set # CONFIG_NET_VENDOR_SEEQ is not set
# CONFIG_NET_VENDOR_SMSC is not set # CONFIG_NET_VENDOR_SMSC is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
...@@ -302,7 +333,6 @@ CONFIG_MOUSE_SERIAL=m ...@@ -302,7 +333,6 @@ CONFIG_MOUSE_SERIAL=m
CONFIG_INPUT_MISC=y CONFIG_INPUT_MISC=y
CONFIG_INPUT_M68K_BEEP=m CONFIG_INPUT_M68K_BEEP=m
CONFIG_SERIO=m CONFIG_SERIO=m
CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set # CONFIG_DEVKMEM is not set
CONFIG_SERIAL_PMACZILOG=y CONFIG_SERIAL_PMACZILOG=y
...@@ -327,10 +357,6 @@ CONFIG_RTC_CLASS=y ...@@ -327,10 +357,6 @@ CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_GENERIC=m CONFIG_RTC_DRV_GENERIC=m
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_PROC_HARDWARE=y CONFIG_PROC_HARDWARE=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
# CONFIG_EXT3_FS_XATTR is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -367,7 +393,7 @@ CONFIG_QNX6FS_FS=m ...@@ -367,7 +393,7 @@ CONFIG_QNX6FS_FS=m
CONFIG_SYSV_FS=m CONFIG_SYSV_FS=m
CONFIG_UFS_FS=m CONFIG_UFS_FS=m
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
CONFIG_NFS_V4=y CONFIG_NFS_V4=m
CONFIG_NFS_SWAP=y CONFIG_NFS_SWAP=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
...@@ -426,10 +452,11 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -426,10 +452,11 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_STRING_HELPERS=m
CONFIG_EARLY_PRINTK=y
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_NULL=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_CCM=m
...@@ -462,6 +489,8 @@ CONFIG_CRYPTO_TEA=m ...@@ -462,6 +489,8 @@ CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_ZLIB=m CONFIG_CRYPTO_ZLIB=m
CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m
# CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
......
arch/m68k/configs/multi_defconfig
View file @ 8cf7a16e
...@@ -58,7 +58,6 @@ CONFIG_IP_PNP_RARP=y ...@@ -58,7 +58,6 @@ CONFIG_IP_PNP_RARP=y
CONFIG_NET_IPIP=m CONFIG_NET_IPIP=m
CONFIG_NET_IPGRE_DEMUX=m CONFIG_NET_IPGRE_DEMUX=m
CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE=m
CONFIG_SYN_COOKIES=y
CONFIG_NET_IPVTI=m CONFIG_NET_IPVTI=m
CONFIG_INET_AH=m CONFIG_INET_AH=m
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
...@@ -69,11 +68,11 @@ CONFIG_INET_XFRM_MODE_BEET=m ...@@ -69,11 +68,11 @@ CONFIG_INET_XFRM_MODE_BEET=m
# CONFIG_INET_LRO is not set # CONFIG_INET_LRO is not set
CONFIG_INET_DIAG=m CONFIG_INET_DIAG=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTER_PREF=y
CONFIG_INET6_AH=m CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m CONFIG_INET6_ESP=m
CONFIG_INET6_IPCOMP=m CONFIG_INET6_IPCOMP=m
CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
...@@ -91,6 +90,17 @@ CONFIG_NF_CONNTRACK_PPTP=m ...@@ -91,6 +90,17 @@ CONFIG_NF_CONNTRACK_PPTP=m
CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_CT=m
CONFIG_NFT_RBTREE=m
CONFIG_NFT_HASH=m
CONFIG_NFT_COUNTER=m
CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m
CONFIG_NFT_NAT=m
CONFIG_NFT_COMPAT=m
CONFIG_NETFILTER_XT_SET=m CONFIG_NETFILTER_XT_SET=m
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
...@@ -104,6 +114,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m ...@@ -104,6 +114,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TEE=m
CONFIG_NETFILTER_XT_TARGET_TPROXY=m
CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_TRACE=m
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
...@@ -136,6 +147,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m ...@@ -136,6 +147,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
CONFIG_NETFILTER_XT_MATCH_REALM=m CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_RECENT=m CONFIG_NETFILTER_XT_MATCH_RECENT=m
CONFIG_NETFILTER_XT_MATCH_SOCKET=m
CONFIG_NETFILTER_XT_MATCH_STATE=m CONFIG_NETFILTER_XT_MATCH_STATE=m
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_STRING=m
...@@ -150,11 +162,18 @@ CONFIG_IP_SET_HASH_IP=m ...@@ -150,11 +162,18 @@ CONFIG_IP_SET_HASH_IP=m
CONFIG_IP_SET_HASH_IPPORT=m CONFIG_IP_SET_HASH_IPPORT=m
CONFIG_IP_SET_HASH_IPPORTIP=m CONFIG_IP_SET_HASH_IPPORTIP=m
CONFIG_IP_SET_HASH_IPPORTNET=m CONFIG_IP_SET_HASH_IPPORTNET=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m CONFIG_IP_SET_HASH_NET=m
CONFIG_IP_SET_HASH_NETNET=m
CONFIG_IP_SET_HASH_NETPORT=m CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_TABLES_IPV4=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_NAT_IPV4=m
CONFIG_NF_TABLES_ARP=m
CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m CONFIG_IP_NF_MATCH_ECN=m
...@@ -162,6 +181,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m ...@@ -162,6 +181,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_NF_NAT_IPV4=m CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_MASQUERADE=m
...@@ -176,6 +196,9 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -176,6 +196,9 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_MATCH_EUI64=m
...@@ -189,11 +212,13 @@ CONFIG_IP6_NF_MATCH_RT=m ...@@ -189,11 +212,13 @@ CONFIG_IP6_NF_MATCH_RT=m
CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_HL=m
CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_RAW=m
CONFIG_NF_NAT_IPV6=m CONFIG_NF_NAT_IPV6=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=m
CONFIG_IP_DCCP=m CONFIG_IP_DCCP=m
# CONFIG_IP_DCCP_CCID3 is not set # CONFIG_IP_DCCP_CCID3 is not set
CONFIG_SCTP_COOKIE_HMAC_SHA1=y CONFIG_SCTP_COOKIE_HMAC_SHA1=y
...@@ -204,11 +229,13 @@ CONFIG_ATALK=m ...@@ -204,11 +229,13 @@ CONFIG_ATALK=m
CONFIG_DEV_APPLETALK=m CONFIG_DEV_APPLETALK=m
CONFIG_IPDDP=m CONFIG_IPDDP=m
CONFIG_IPDDP_ENCAP=y CONFIG_IPDDP_ENCAP=y
CONFIG_IPDDP_DECAP=y CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y
CONFIG_NETLINK_DIAG=m
CONFIG_NET_MPLS_GSO=m
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
# CONFIG_FIRMWARE_IN_KERNEL is not set # CONFIG_FIRMWARE_IN_KERNEL is not set
# CONFIG_FW_LOADER_USER_HELPER is not set # CONFIG_FW_LOADER_USER_HELPER is not set
...@@ -230,6 +257,7 @@ CONFIG_BLK_DEV_NBD=m ...@@ -230,6 +257,7 @@ CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD=m
CONFIG_ATA_OVER_ETH=m CONFIG_ATA_OVER_ETH=m
CONFIG_DUMMY_IRQ=m
CONFIG_IDE=y CONFIG_IDE=y
CONFIG_IDE_GD_ATAPI=y CONFIG_IDE_GD_ATAPI=y
CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_IDECD=y
...@@ -290,10 +318,10 @@ CONFIG_MAC_EMUMOUSEBTN=y ...@@ -290,10 +318,10 @@ CONFIG_MAC_EMUMOUSEBTN=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_DUMMY=m CONFIG_DUMMY=m
CONFIG_EQUALIZER=m CONFIG_EQUALIZER=m
CONFIG_MII=y
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
CONFIG_NET_TEAM_MODE_RANDOM=m
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
...@@ -308,10 +336,10 @@ CONFIG_HPLANCE=y ...@@ -308,10 +336,10 @@ CONFIG_HPLANCE=y
CONFIG_MVME147_NET=y CONFIG_MVME147_NET=y
CONFIG_SUN3LANCE=y CONFIG_SUN3LANCE=y
CONFIG_MACMACE=y CONFIG_MACMACE=y
# CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set # CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
CONFIG_MAC89x0=y CONFIG_MAC89x0=y
# CONFIG_NET_VENDOR_FUJITSU is not set
# CONFIG_NET_VENDOR_HP is not set # CONFIG_NET_VENDOR_HP is not set
CONFIG_BVME6000_NET=y CONFIG_BVME6000_NET=y
CONFIG_MVME16x_NET=y CONFIG_MVME16x_NET=y
...@@ -325,6 +353,7 @@ CONFIG_APNE=y ...@@ -325,6 +353,7 @@ CONFIG_APNE=y
CONFIG_ZORRO8390=y CONFIG_ZORRO8390=y
# CONFIG_NET_VENDOR_SEEQ is not set # CONFIG_NET_VENDOR_SEEQ is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
CONFIG_PLIP=m CONFIG_PLIP=m
CONFIG_PPP=m CONFIG_PPP=m
...@@ -357,7 +386,6 @@ CONFIG_INPUT_MISC=y ...@@ -357,7 +386,6 @@ CONFIG_INPUT_MISC=y
CONFIG_INPUT_M68K_BEEP=m CONFIG_INPUT_M68K_BEEP=m
CONFIG_HP_SDC_RTC=m CONFIG_HP_SDC_RTC=m
CONFIG_SERIO_Q40KBD=y CONFIG_SERIO_Q40KBD=y
CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set # CONFIG_DEVKMEM is not set
CONFIG_SERIAL_PMACZILOG=y CONFIG_SERIAL_PMACZILOG=y
...@@ -405,10 +433,6 @@ CONFIG_NFETH=y ...@@ -405,10 +433,6 @@ CONFIG_NFETH=y
CONFIG_ATARI_DSP56K=m CONFIG_ATARI_DSP56K=m
CONFIG_AMIGA_BUILTIN_SERIAL=y CONFIG_AMIGA_BUILTIN_SERIAL=y
CONFIG_SERIAL_CONSOLE=y CONFIG_SERIAL_CONSOLE=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
# CONFIG_EXT3_FS_XATTR is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -445,7 +469,7 @@ CONFIG_QNX6FS_FS=m ...@@ -445,7 +469,7 @@ CONFIG_QNX6FS_FS=m
CONFIG_SYSV_FS=m CONFIG_SYSV_FS=m
CONFIG_UFS_FS=m CONFIG_UFS_FS=m
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
CONFIG_NFS_V4=y CONFIG_NFS_V4=m
CONFIG_NFS_SWAP=y CONFIG_NFS_SWAP=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
...@@ -504,10 +528,11 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -504,10 +528,11 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_STRING_HELPERS=m
CONFIG_EARLY_PRINTK=y
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_NULL=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_CCM=m
...@@ -540,6 +565,8 @@ CONFIG_CRYPTO_TEA=m ...@@ -540,6 +565,8 @@ CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_ZLIB=m CONFIG_CRYPTO_ZLIB=m
CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m
# CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
......
arch/m68k/configs/mvme147_defconfig
View file @ 8cf7a16e
...@@ -47,7 +47,6 @@ CONFIG_IP_PNP_RARP=y ...@@ -47,7 +47,6 @@ CONFIG_IP_PNP_RARP=y
CONFIG_NET_IPIP=m CONFIG_NET_IPIP=m
CONFIG_NET_IPGRE_DEMUX=m CONFIG_NET_IPGRE_DEMUX=m
CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE=m
CONFIG_SYN_COOKIES=y
CONFIG_NET_IPVTI=m CONFIG_NET_IPVTI=m
CONFIG_INET_AH=m CONFIG_INET_AH=m
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
...@@ -58,11 +57,11 @@ CONFIG_INET_XFRM_MODE_BEET=m ...@@ -58,11 +57,11 @@ CONFIG_INET_XFRM_MODE_BEET=m
# CONFIG_INET_LRO is not set # CONFIG_INET_LRO is not set
CONFIG_INET_DIAG=m CONFIG_INET_DIAG=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTER_PREF=y
CONFIG_INET6_AH=m CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m CONFIG_INET6_ESP=m
CONFIG_INET6_IPCOMP=m CONFIG_INET6_IPCOMP=m
CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
...@@ -80,6 +79,17 @@ CONFIG_NF_CONNTRACK_PPTP=m ...@@ -80,6 +79,17 @@ CONFIG_NF_CONNTRACK_PPTP=m
CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_CT=m
CONFIG_NFT_RBTREE=m
CONFIG_NFT_HASH=m
CONFIG_NFT_COUNTER=m
CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m
CONFIG_NFT_NAT=m
CONFIG_NFT_COMPAT=m
CONFIG_NETFILTER_XT_SET=m CONFIG_NETFILTER_XT_SET=m
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
...@@ -93,6 +103,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m ...@@ -93,6 +103,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TEE=m
CONFIG_NETFILTER_XT_TARGET_TPROXY=m
CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_TRACE=m
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
...@@ -125,6 +136,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m ...@@ -125,6 +136,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
CONFIG_NETFILTER_XT_MATCH_REALM=m CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_RECENT=m CONFIG_NETFILTER_XT_MATCH_RECENT=m
CONFIG_NETFILTER_XT_MATCH_SOCKET=m
CONFIG_NETFILTER_XT_MATCH_STATE=m CONFIG_NETFILTER_XT_MATCH_STATE=m
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_STRING=m
...@@ -139,11 +151,18 @@ CONFIG_IP_SET_HASH_IP=m ...@@ -139,11 +151,18 @@ CONFIG_IP_SET_HASH_IP=m
CONFIG_IP_SET_HASH_IPPORT=m CONFIG_IP_SET_HASH_IPPORT=m
CONFIG_IP_SET_HASH_IPPORTIP=m CONFIG_IP_SET_HASH_IPPORTIP=m
CONFIG_IP_SET_HASH_IPPORTNET=m CONFIG_IP_SET_HASH_IPPORTNET=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m CONFIG_IP_SET_HASH_NET=m
CONFIG_IP_SET_HASH_NETNET=m
CONFIG_IP_SET_HASH_NETPORT=m CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_TABLES_IPV4=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_NAT_IPV4=m
CONFIG_NF_TABLES_ARP=m
CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m CONFIG_IP_NF_MATCH_ECN=m
...@@ -151,6 +170,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m ...@@ -151,6 +170,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_NF_NAT_IPV4=m CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_MASQUERADE=m
...@@ -165,6 +185,9 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -165,6 +185,9 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_MATCH_EUI64=m
...@@ -178,11 +201,13 @@ CONFIG_IP6_NF_MATCH_RT=m ...@@ -178,11 +201,13 @@ CONFIG_IP6_NF_MATCH_RT=m
CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_HL=m
CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_RAW=m
CONFIG_NF_NAT_IPV6=m CONFIG_NF_NAT_IPV6=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=m
CONFIG_IP_DCCP=m CONFIG_IP_DCCP=m
# CONFIG_IP_DCCP_CCID3 is not set # CONFIG_IP_DCCP_CCID3 is not set
CONFIG_SCTP_COOKIE_HMAC_SHA1=y CONFIG_SCTP_COOKIE_HMAC_SHA1=y
...@@ -190,10 +215,13 @@ CONFIG_RDS=m ...@@ -190,10 +215,13 @@ CONFIG_RDS=m
CONFIG_RDS_TCP=m CONFIG_RDS_TCP=m
CONFIG_L2TP=m CONFIG_L2TP=m
CONFIG_ATALK=m CONFIG_ATALK=m
CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y
CONFIG_NETLINK_DIAG=m
CONFIG_NET_MPLS_GSO=m
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
# CONFIG_FIRMWARE_IN_KERNEL is not set # CONFIG_FIRMWARE_IN_KERNEL is not set
# CONFIG_FW_LOADER_USER_HELPER is not set # CONFIG_FW_LOADER_USER_HELPER is not set
...@@ -205,6 +233,7 @@ CONFIG_BLK_DEV_NBD=m ...@@ -205,6 +233,7 @@ CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD=m
CONFIG_ATA_OVER_ETH=m CONFIG_ATA_OVER_ETH=m
CONFIG_DUMMY_IRQ=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_SCSI_TGT=m CONFIG_SCSI_TGT=m
...@@ -242,6 +271,7 @@ CONFIG_EQUALIZER=m ...@@ -242,6 +271,7 @@ CONFIG_EQUALIZER=m
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
CONFIG_NET_TEAM_MODE_RANDOM=m
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
...@@ -249,6 +279,7 @@ CONFIG_NETCONSOLE=m ...@@ -249,6 +279,7 @@ CONFIG_NETCONSOLE=m
CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETCONSOLE_DYNAMIC=y
CONFIG_VETH=m CONFIG_VETH=m
CONFIG_MVME147_NET=y CONFIG_MVME147_NET=y
# CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set # CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_VENDOR_INTEL is not set # CONFIG_NET_VENDOR_INTEL is not set
...@@ -257,6 +288,7 @@ CONFIG_MVME147_NET=y ...@@ -257,6 +288,7 @@ CONFIG_MVME147_NET=y
# CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_NATSEMI is not set
# CONFIG_NET_VENDOR_SEEQ is not set # CONFIG_NET_VENDOR_SEEQ is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
...@@ -294,10 +326,6 @@ CONFIG_RTC_CLASS=y ...@@ -294,10 +326,6 @@ CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_GENERIC=m CONFIG_RTC_DRV_GENERIC=m
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_PROC_HARDWARE=y CONFIG_PROC_HARDWARE=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
# CONFIG_EXT3_FS_XATTR is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -334,7 +362,7 @@ CONFIG_QNX6FS_FS=m ...@@ -334,7 +362,7 @@ CONFIG_QNX6FS_FS=m
CONFIG_SYSV_FS=m CONFIG_SYSV_FS=m
CONFIG_UFS_FS=m CONFIG_UFS_FS=m
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
CONFIG_NFS_V4=y CONFIG_NFS_V4=m
CONFIG_NFS_SWAP=y CONFIG_NFS_SWAP=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
...@@ -393,10 +421,10 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -393,10 +421,10 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_STRING_HELPERS=m
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_NULL=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_CCM=m
...@@ -429,6 +457,8 @@ CONFIG_CRYPTO_TEA=m ...@@ -429,6 +457,8 @@ CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_ZLIB=m CONFIG_CRYPTO_ZLIB=m
CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m
# CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
......
arch/m68k/configs/mvme16x_defconfig
View file @ 8cf7a16e
...@@ -48,7 +48,6 @@ CONFIG_IP_PNP_RARP=y ...@@ -48,7 +48,6 @@ CONFIG_IP_PNP_RARP=y
CONFIG_NET_IPIP=m CONFIG_NET_IPIP=m
CONFIG_NET_IPGRE_DEMUX=m CONFIG_NET_IPGRE_DEMUX=m
CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE=m
CONFIG_SYN_COOKIES=y
CONFIG_NET_IPVTI=m CONFIG_NET_IPVTI=m
CONFIG_INET_AH=m CONFIG_INET_AH=m
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
...@@ -59,11 +58,11 @@ CONFIG_INET_XFRM_MODE_BEET=m ...@@ -59,11 +58,11 @@ CONFIG_INET_XFRM_MODE_BEET=m
# CONFIG_INET_LRO is not set # CONFIG_INET_LRO is not set
CONFIG_INET_DIAG=m CONFIG_INET_DIAG=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTER_PREF=y
CONFIG_INET6_AH=m CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m CONFIG_INET6_ESP=m
CONFIG_INET6_IPCOMP=m CONFIG_INET6_IPCOMP=m
CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
...@@ -81,6 +80,17 @@ CONFIG_NF_CONNTRACK_PPTP=m ...@@ -81,6 +80,17 @@ CONFIG_NF_CONNTRACK_PPTP=m
CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_CT=m
CONFIG_NFT_RBTREE=m
CONFIG_NFT_HASH=m
CONFIG_NFT_COUNTER=m
CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m
CONFIG_NFT_NAT=m
CONFIG_NFT_COMPAT=m
CONFIG_NETFILTER_XT_SET=m CONFIG_NETFILTER_XT_SET=m
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
...@@ -94,6 +104,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m ...@@ -94,6 +104,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TEE=m
CONFIG_NETFILTER_XT_TARGET_TPROXY=m
CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_TRACE=m
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
...@@ -126,6 +137,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m ...@@ -126,6 +137,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
CONFIG_NETFILTER_XT_MATCH_REALM=m CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_RECENT=m CONFIG_NETFILTER_XT_MATCH_RECENT=m
CONFIG_NETFILTER_XT_MATCH_SOCKET=m
CONFIG_NETFILTER_XT_MATCH_STATE=m CONFIG_NETFILTER_XT_MATCH_STATE=m
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_STRING=m
...@@ -140,11 +152,18 @@ CONFIG_IP_SET_HASH_IP=m ...@@ -140,11 +152,18 @@ CONFIG_IP_SET_HASH_IP=m
CONFIG_IP_SET_HASH_IPPORT=m CONFIG_IP_SET_HASH_IPPORT=m
CONFIG_IP_SET_HASH_IPPORTIP=m CONFIG_IP_SET_HASH_IPPORTIP=m
CONFIG_IP_SET_HASH_IPPORTNET=m CONFIG_IP_SET_HASH_IPPORTNET=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m CONFIG_IP_SET_HASH_NET=m
CONFIG_IP_SET_HASH_NETNET=m
CONFIG_IP_SET_HASH_NETPORT=m CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_TABLES_IPV4=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_NAT_IPV4=m
CONFIG_NF_TABLES_ARP=m
CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m CONFIG_IP_NF_MATCH_ECN=m
...@@ -152,6 +171,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m ...@@ -152,6 +171,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_NF_NAT_IPV4=m CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_MASQUERADE=m
...@@ -166,6 +186,9 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -166,6 +186,9 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_MATCH_EUI64=m
...@@ -179,11 +202,13 @@ CONFIG_IP6_NF_MATCH_RT=m ...@@ -179,11 +202,13 @@ CONFIG_IP6_NF_MATCH_RT=m
CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_HL=m
CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_RAW=m
CONFIG_NF_NAT_IPV6=m CONFIG_NF_NAT_IPV6=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=m
CONFIG_IP_DCCP=m CONFIG_IP_DCCP=m
# CONFIG_IP_DCCP_CCID3 is not set # CONFIG_IP_DCCP_CCID3 is not set
CONFIG_SCTP_COOKIE_HMAC_SHA1=y CONFIG_SCTP_COOKIE_HMAC_SHA1=y
...@@ -191,10 +216,13 @@ CONFIG_RDS=m ...@@ -191,10 +216,13 @@ CONFIG_RDS=m
CONFIG_RDS_TCP=m CONFIG_RDS_TCP=m
CONFIG_L2TP=m CONFIG_L2TP=m
CONFIG_ATALK=m CONFIG_ATALK=m
CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y
CONFIG_NETLINK_DIAG=m
CONFIG_NET_MPLS_GSO=m
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
# CONFIG_FIRMWARE_IN_KERNEL is not set # CONFIG_FIRMWARE_IN_KERNEL is not set
# CONFIG_FW_LOADER_USER_HELPER is not set # CONFIG_FW_LOADER_USER_HELPER is not set
...@@ -206,6 +234,7 @@ CONFIG_BLK_DEV_NBD=m ...@@ -206,6 +234,7 @@ CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD=m
CONFIG_ATA_OVER_ETH=m CONFIG_ATA_OVER_ETH=m
CONFIG_DUMMY_IRQ=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_SCSI_TGT=m CONFIG_SCSI_TGT=m
...@@ -243,12 +272,14 @@ CONFIG_EQUALIZER=m ...@@ -243,12 +272,14 @@ CONFIG_EQUALIZER=m
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
CONFIG_NET_TEAM_MODE_RANDOM=m
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE=m
CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETCONSOLE_DYNAMIC=y
CONFIG_VETH=m CONFIG_VETH=m
# CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set # CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
CONFIG_MVME16x_NET=y CONFIG_MVME16x_NET=y
...@@ -257,6 +288,7 @@ CONFIG_MVME16x_NET=y ...@@ -257,6 +288,7 @@ CONFIG_MVME16x_NET=y
# CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_NATSEMI is not set
# CONFIG_NET_VENDOR_SEEQ is not set # CONFIG_NET_VENDOR_SEEQ is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
...@@ -294,10 +326,6 @@ CONFIG_RTC_CLASS=y ...@@ -294,10 +326,6 @@ CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_GENERIC=m CONFIG_RTC_DRV_GENERIC=m
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_PROC_HARDWARE=y CONFIG_PROC_HARDWARE=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
# CONFIG_EXT3_FS_XATTR is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -334,7 +362,7 @@ CONFIG_QNX6FS_FS=m ...@@ -334,7 +362,7 @@ CONFIG_QNX6FS_FS=m
CONFIG_SYSV_FS=m CONFIG_SYSV_FS=m
CONFIG_UFS_FS=m CONFIG_UFS_FS=m
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
CONFIG_NFS_V4=y CONFIG_NFS_V4=m
CONFIG_NFS_SWAP=y CONFIG_NFS_SWAP=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
...@@ -393,10 +421,11 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -393,10 +421,11 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_STRING_HELPERS=m
CONFIG_EARLY_PRINTK=y
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_NULL=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_CCM=m
...@@ -429,6 +458,8 @@ CONFIG_CRYPTO_TEA=m ...@@ -429,6 +458,8 @@ CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_ZLIB=m CONFIG_CRYPTO_ZLIB=m
CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m
# CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
......
arch/m68k/configs/q40_defconfig
View file @ 8cf7a16e
...@@ -48,7 +48,6 @@ CONFIG_IP_PNP_RARP=y ...@@ -48,7 +48,6 @@ CONFIG_IP_PNP_RARP=y
CONFIG_NET_IPIP=m CONFIG_NET_IPIP=m
CONFIG_NET_IPGRE_DEMUX=m CONFIG_NET_IPGRE_DEMUX=m
CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE=m
CONFIG_SYN_COOKIES=y
CONFIG_NET_IPVTI=m CONFIG_NET_IPVTI=m
CONFIG_INET_AH=m CONFIG_INET_AH=m
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
...@@ -59,11 +58,11 @@ CONFIG_INET_XFRM_MODE_BEET=m ...@@ -59,11 +58,11 @@ CONFIG_INET_XFRM_MODE_BEET=m
# CONFIG_INET_LRO is not set # CONFIG_INET_LRO is not set
CONFIG_INET_DIAG=m CONFIG_INET_DIAG=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTER_PREF=y
CONFIG_INET6_AH=m CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m CONFIG_INET6_ESP=m
CONFIG_INET6_IPCOMP=m CONFIG_INET6_IPCOMP=m
CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
...@@ -81,6 +80,17 @@ CONFIG_NF_CONNTRACK_PPTP=m ...@@ -81,6 +80,17 @@ CONFIG_NF_CONNTRACK_PPTP=m
CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_CT=m
CONFIG_NFT_RBTREE=m
CONFIG_NFT_HASH=m
CONFIG_NFT_COUNTER=m
CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m
CONFIG_NFT_NAT=m
CONFIG_NFT_COMPAT=m
CONFIG_NETFILTER_XT_SET=m CONFIG_NETFILTER_XT_SET=m
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
...@@ -94,6 +104,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m ...@@ -94,6 +104,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TEE=m
CONFIG_NETFILTER_XT_TARGET_TPROXY=m
CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_TRACE=m
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
...@@ -126,6 +137,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m ...@@ -126,6 +137,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
CONFIG_NETFILTER_XT_MATCH_REALM=m CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_RECENT=m CONFIG_NETFILTER_XT_MATCH_RECENT=m
CONFIG_NETFILTER_XT_MATCH_SOCKET=m
CONFIG_NETFILTER_XT_MATCH_STATE=m CONFIG_NETFILTER_XT_MATCH_STATE=m
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_STRING=m
...@@ -140,11 +152,18 @@ CONFIG_IP_SET_HASH_IP=m ...@@ -140,11 +152,18 @@ CONFIG_IP_SET_HASH_IP=m
CONFIG_IP_SET_HASH_IPPORT=m CONFIG_IP_SET_HASH_IPPORT=m
CONFIG_IP_SET_HASH_IPPORTIP=m CONFIG_IP_SET_HASH_IPPORTIP=m
CONFIG_IP_SET_HASH_IPPORTNET=m CONFIG_IP_SET_HASH_IPPORTNET=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m CONFIG_IP_SET_HASH_NET=m
CONFIG_IP_SET_HASH_NETNET=m
CONFIG_IP_SET_HASH_NETPORT=m CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_TABLES_IPV4=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_NAT_IPV4=m
CONFIG_NF_TABLES_ARP=m
CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m CONFIG_IP_NF_MATCH_ECN=m
...@@ -152,6 +171,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m ...@@ -152,6 +171,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_NF_NAT_IPV4=m CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_MASQUERADE=m
...@@ -166,6 +186,9 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -166,6 +186,9 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_MATCH_EUI64=m
...@@ -179,11 +202,13 @@ CONFIG_IP6_NF_MATCH_RT=m ...@@ -179,11 +202,13 @@ CONFIG_IP6_NF_MATCH_RT=m
CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_HL=m
CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_RAW=m
CONFIG_NF_NAT_IPV6=m CONFIG_NF_NAT_IPV6=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=m
CONFIG_IP_DCCP=m CONFIG_IP_DCCP=m
# CONFIG_IP_DCCP_CCID3 is not set # CONFIG_IP_DCCP_CCID3 is not set
CONFIG_SCTP_COOKIE_HMAC_SHA1=y CONFIG_SCTP_COOKIE_HMAC_SHA1=y
...@@ -191,10 +216,13 @@ CONFIG_RDS=m ...@@ -191,10 +216,13 @@ CONFIG_RDS=m
CONFIG_RDS_TCP=m CONFIG_RDS_TCP=m
CONFIG_L2TP=m CONFIG_L2TP=m
CONFIG_ATALK=m CONFIG_ATALK=m
CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y
CONFIG_NETLINK_DIAG=m
CONFIG_NET_MPLS_GSO=m
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
# CONFIG_FIRMWARE_IN_KERNEL is not set # CONFIG_FIRMWARE_IN_KERNEL is not set
# CONFIG_FW_LOADER_USER_HELPER is not set # CONFIG_FW_LOADER_USER_HELPER is not set
...@@ -209,6 +237,7 @@ CONFIG_BLK_DEV_NBD=m ...@@ -209,6 +237,7 @@ CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD=m
CONFIG_ATA_OVER_ETH=m CONFIG_ATA_OVER_ETH=m
CONFIG_DUMMY_IRQ=m
CONFIG_IDE=y CONFIG_IDE=y
CONFIG_IDE_GD_ATAPI=y CONFIG_IDE_GD_ATAPI=y
CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_IDECD=y
...@@ -249,6 +278,7 @@ CONFIG_EQUALIZER=m ...@@ -249,6 +278,7 @@ CONFIG_EQUALIZER=m
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
CONFIG_NET_TEAM_MODE_RANDOM=m
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
...@@ -257,10 +287,10 @@ CONFIG_NETCONSOLE_DYNAMIC=y ...@@ -257,10 +287,10 @@ CONFIG_NETCONSOLE_DYNAMIC=y
CONFIG_VETH=m CONFIG_VETH=m
# CONFIG_NET_VENDOR_3COM is not set # CONFIG_NET_VENDOR_3COM is not set
# CONFIG_NET_VENDOR_AMD is not set # CONFIG_NET_VENDOR_AMD is not set
# CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set # CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_VENDOR_CIRRUS is not set # CONFIG_NET_VENDOR_CIRRUS is not set
# CONFIG_NET_VENDOR_FUJITSU is not set
# CONFIG_NET_VENDOR_HP is not set # CONFIG_NET_VENDOR_HP is not set
# CONFIG_NET_VENDOR_INTEL is not set # CONFIG_NET_VENDOR_INTEL is not set
# CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MARVELL is not set
...@@ -269,6 +299,7 @@ CONFIG_NE2000=m ...@@ -269,6 +299,7 @@ CONFIG_NE2000=m
# CONFIG_NET_VENDOR_SEEQ is not set # CONFIG_NET_VENDOR_SEEQ is not set
# CONFIG_NET_VENDOR_SMSC is not set # CONFIG_NET_VENDOR_SMSC is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
CONFIG_PLIP=m CONFIG_PLIP=m
CONFIG_PPP=m CONFIG_PPP=m
...@@ -293,7 +324,6 @@ CONFIG_MOUSE_SERIAL=m ...@@ -293,7 +324,6 @@ CONFIG_MOUSE_SERIAL=m
CONFIG_INPUT_MISC=y CONFIG_INPUT_MISC=y
CONFIG_INPUT_M68K_BEEP=m CONFIG_INPUT_M68K_BEEP=m
CONFIG_SERIO_Q40KBD=y CONFIG_SERIO_Q40KBD=y
CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set # CONFIG_DEVKMEM is not set
CONFIG_PRINTER=m CONFIG_PRINTER=m
...@@ -318,10 +348,6 @@ CONFIG_RTC_DRV_GENERIC=m ...@@ -318,10 +348,6 @@ CONFIG_RTC_DRV_GENERIC=m
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_HEARTBEAT=y CONFIG_HEARTBEAT=y
CONFIG_PROC_HARDWARE=y CONFIG_PROC_HARDWARE=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
# CONFIG_EXT3_FS_XATTR is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -358,7 +384,7 @@ CONFIG_QNX6FS_FS=m ...@@ -358,7 +384,7 @@ CONFIG_QNX6FS_FS=m
CONFIG_SYSV_FS=m CONFIG_SYSV_FS=m
CONFIG_UFS_FS=m CONFIG_UFS_FS=m
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
CONFIG_NFS_V4=y CONFIG_NFS_V4=m
CONFIG_NFS_SWAP=y CONFIG_NFS_SWAP=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
...@@ -417,10 +443,10 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -417,10 +443,10 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_STRING_HELPERS=m
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_NULL=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_CCM=m
...@@ -453,6 +479,8 @@ CONFIG_CRYPTO_TEA=m ...@@ -453,6 +479,8 @@ CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_ZLIB=m CONFIG_CRYPTO_ZLIB=m
CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m
# CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
......
arch/m68k/configs/sun3_defconfig
View file @ 8cf7a16e
...@@ -45,7 +45,6 @@ CONFIG_IP_PNP_RARP=y ...@@ -45,7 +45,6 @@ CONFIG_IP_PNP_RARP=y
CONFIG_NET_IPIP=m CONFIG_NET_IPIP=m
CONFIG_NET_IPGRE_DEMUX=m CONFIG_NET_IPGRE_DEMUX=m
CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE=m
CONFIG_SYN_COOKIES=y
CONFIG_NET_IPVTI=m CONFIG_NET_IPVTI=m
CONFIG_INET_AH=m CONFIG_INET_AH=m
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
...@@ -56,11 +55,11 @@ CONFIG_INET_XFRM_MODE_BEET=m ...@@ -56,11 +55,11 @@ CONFIG_INET_XFRM_MODE_BEET=m
# CONFIG_INET_LRO is not set # CONFIG_INET_LRO is not set
CONFIG_INET_DIAG=m CONFIG_INET_DIAG=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTER_PREF=y
CONFIG_INET6_AH=m CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m CONFIG_INET6_ESP=m
CONFIG_INET6_IPCOMP=m CONFIG_INET6_IPCOMP=m
CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
...@@ -78,6 +77,17 @@ CONFIG_NF_CONNTRACK_PPTP=m ...@@ -78,6 +77,17 @@ CONFIG_NF_CONNTRACK_PPTP=m
CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_CT=m
CONFIG_NFT_RBTREE=m
CONFIG_NFT_HASH=m
CONFIG_NFT_COUNTER=m
CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m
CONFIG_NFT_NAT=m
CONFIG_NFT_COMPAT=m
CONFIG_NETFILTER_XT_SET=m CONFIG_NETFILTER_XT_SET=m
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
...@@ -91,6 +101,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m ...@@ -91,6 +101,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TEE=m
CONFIG_NETFILTER_XT_TARGET_TPROXY=m
CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_TRACE=m
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
...@@ -123,6 +134,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m ...@@ -123,6 +134,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
CONFIG_NETFILTER_XT_MATCH_REALM=m CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_RECENT=m CONFIG_NETFILTER_XT_MATCH_RECENT=m
CONFIG_NETFILTER_XT_MATCH_SOCKET=m
CONFIG_NETFILTER_XT_MATCH_STATE=m CONFIG_NETFILTER_XT_MATCH_STATE=m
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_STRING=m
...@@ -137,11 +149,18 @@ CONFIG_IP_SET_HASH_IP=m ...@@ -137,11 +149,18 @@ CONFIG_IP_SET_HASH_IP=m
CONFIG_IP_SET_HASH_IPPORT=m CONFIG_IP_SET_HASH_IPPORT=m
CONFIG_IP_SET_HASH_IPPORTIP=m CONFIG_IP_SET_HASH_IPPORTIP=m
CONFIG_IP_SET_HASH_IPPORTNET=m CONFIG_IP_SET_HASH_IPPORTNET=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m CONFIG_IP_SET_HASH_NET=m
CONFIG_IP_SET_HASH_NETNET=m
CONFIG_IP_SET_HASH_NETPORT=m CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_TABLES_IPV4=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_NAT_IPV4=m
CONFIG_NF_TABLES_ARP=m
CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m CONFIG_IP_NF_MATCH_ECN=m
...@@ -149,6 +168,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m ...@@ -149,6 +168,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_NF_NAT_IPV4=m CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_MASQUERADE=m
...@@ -163,6 +183,9 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -163,6 +183,9 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_MATCH_EUI64=m
...@@ -176,11 +199,13 @@ CONFIG_IP6_NF_MATCH_RT=m ...@@ -176,11 +199,13 @@ CONFIG_IP6_NF_MATCH_RT=m
CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_HL=m
CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_RAW=m
CONFIG_NF_NAT_IPV6=m CONFIG_NF_NAT_IPV6=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=m
CONFIG_IP_DCCP=m CONFIG_IP_DCCP=m
# CONFIG_IP_DCCP_CCID3 is not set # CONFIG_IP_DCCP_CCID3 is not set
CONFIG_SCTP_COOKIE_HMAC_SHA1=y CONFIG_SCTP_COOKIE_HMAC_SHA1=y
...@@ -188,10 +213,13 @@ CONFIG_RDS=m ...@@ -188,10 +213,13 @@ CONFIG_RDS=m
CONFIG_RDS_TCP=m CONFIG_RDS_TCP=m
CONFIG_L2TP=m CONFIG_L2TP=m
CONFIG_ATALK=m CONFIG_ATALK=m
CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y
CONFIG_NETLINK_DIAG=m
CONFIG_NET_MPLS_GSO=m
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
# CONFIG_FIRMWARE_IN_KERNEL is not set # CONFIG_FIRMWARE_IN_KERNEL is not set
# CONFIG_FW_LOADER_USER_HELPER is not set # CONFIG_FW_LOADER_USER_HELPER is not set
...@@ -203,6 +231,7 @@ CONFIG_BLK_DEV_NBD=m ...@@ -203,6 +231,7 @@ CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD=m
CONFIG_ATA_OVER_ETH=m CONFIG_ATA_OVER_ETH=m
CONFIG_DUMMY_IRQ=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_SCSI_TGT=m CONFIG_SCSI_TGT=m
...@@ -240,6 +269,7 @@ CONFIG_EQUALIZER=m ...@@ -240,6 +269,7 @@ CONFIG_EQUALIZER=m
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
CONFIG_NET_TEAM_MODE_RANDOM=m
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
...@@ -247,6 +277,7 @@ CONFIG_NETCONSOLE=m ...@@ -247,6 +277,7 @@ CONFIG_NETCONSOLE=m
CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETCONSOLE_DYNAMIC=y
CONFIG_VETH=m CONFIG_VETH=m
CONFIG_SUN3LANCE=y CONFIG_SUN3LANCE=y
# CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set # CONFIG_NET_CADENCE is not set
CONFIG_SUN3_82586=y CONFIG_SUN3_82586=y
# CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MARVELL is not set
...@@ -255,6 +286,7 @@ CONFIG_SUN3_82586=y ...@@ -255,6 +286,7 @@ CONFIG_SUN3_82586=y
# CONFIG_NET_VENDOR_SEEQ is not set # CONFIG_NET_VENDOR_SEEQ is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_SUN is not set # CONFIG_NET_VENDOR_SUN is not set
# CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
...@@ -276,7 +308,6 @@ CONFIG_INPUT_EVDEV=m ...@@ -276,7 +308,6 @@ CONFIG_INPUT_EVDEV=m
CONFIG_KEYBOARD_SUNKBD=y CONFIG_KEYBOARD_SUNKBD=y
# CONFIG_MOUSE_PS2 is not set # CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_SERIAL=m
CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set # CONFIG_DEVKMEM is not set
# CONFIG_HW_RANDOM is not set # CONFIG_HW_RANDOM is not set
...@@ -296,10 +327,6 @@ CONFIG_RTC_CLASS=y ...@@ -296,10 +327,6 @@ CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_GENERIC=m CONFIG_RTC_DRV_GENERIC=m
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_PROC_HARDWARE=y CONFIG_PROC_HARDWARE=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
# CONFIG_EXT3_FS_XATTR is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -336,7 +363,7 @@ CONFIG_QNX6FS_FS=m ...@@ -336,7 +363,7 @@ CONFIG_QNX6FS_FS=m
CONFIG_SYSV_FS=m CONFIG_SYSV_FS=m
CONFIG_UFS_FS=m CONFIG_UFS_FS=m
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
CONFIG_NFS_V4=y CONFIG_NFS_V4=m
CONFIG_NFS_SWAP=y CONFIG_NFS_SWAP=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
...@@ -395,10 +422,10 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -395,10 +422,10 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_STRING_HELPERS=m
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_NULL=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_CCM=m
...@@ -431,6 +458,8 @@ CONFIG_CRYPTO_TEA=m ...@@ -431,6 +458,8 @@ CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_ZLIB=m CONFIG_CRYPTO_ZLIB=m
CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m
# CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
......
arch/m68k/configs/sun3x_defconfig
View file @ 8cf7a16e
...@@ -45,7 +45,6 @@ CONFIG_IP_PNP_RARP=y ...@@ -45,7 +45,6 @@ CONFIG_IP_PNP_RARP=y
CONFIG_NET_IPIP=m CONFIG_NET_IPIP=m
CONFIG_NET_IPGRE_DEMUX=m CONFIG_NET_IPGRE_DEMUX=m
CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE=m
CONFIG_SYN_COOKIES=y
CONFIG_NET_IPVTI=m CONFIG_NET_IPVTI=m
CONFIG_INET_AH=m CONFIG_INET_AH=m
CONFIG_INET_ESP=m CONFIG_INET_ESP=m
...@@ -56,11 +55,11 @@ CONFIG_INET_XFRM_MODE_BEET=m ...@@ -56,11 +55,11 @@ CONFIG_INET_XFRM_MODE_BEET=m
# CONFIG_INET_LRO is not set # CONFIG_INET_LRO is not set
CONFIG_INET_DIAG=m CONFIG_INET_DIAG=m
CONFIG_INET_UDP_DIAG=m CONFIG_INET_UDP_DIAG=m
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTER_PREF=y
CONFIG_INET6_AH=m CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m CONFIG_INET6_ESP=m
CONFIG_INET6_IPCOMP=m CONFIG_INET6_IPCOMP=m
CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
...@@ -78,6 +77,17 @@ CONFIG_NF_CONNTRACK_PPTP=m ...@@ -78,6 +77,17 @@ CONFIG_NF_CONNTRACK_PPTP=m
CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_CT=m
CONFIG_NFT_RBTREE=m
CONFIG_NFT_HASH=m
CONFIG_NFT_COUNTER=m
CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m
CONFIG_NFT_NAT=m
CONFIG_NFT_COMPAT=m
CONFIG_NETFILTER_XT_SET=m CONFIG_NETFILTER_XT_SET=m
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
...@@ -91,6 +101,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m ...@@ -91,6 +101,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TEE=m
CONFIG_NETFILTER_XT_TARGET_TPROXY=m
CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_TRACE=m
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
...@@ -123,6 +134,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m ...@@ -123,6 +134,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
CONFIG_NETFILTER_XT_MATCH_REALM=m CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_RECENT=m CONFIG_NETFILTER_XT_MATCH_RECENT=m
CONFIG_NETFILTER_XT_MATCH_SOCKET=m
CONFIG_NETFILTER_XT_MATCH_STATE=m CONFIG_NETFILTER_XT_MATCH_STATE=m
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_STRING=m
...@@ -137,11 +149,18 @@ CONFIG_IP_SET_HASH_IP=m ...@@ -137,11 +149,18 @@ CONFIG_IP_SET_HASH_IP=m
CONFIG_IP_SET_HASH_IPPORT=m CONFIG_IP_SET_HASH_IPPORT=m
CONFIG_IP_SET_HASH_IPPORTIP=m CONFIG_IP_SET_HASH_IPPORTIP=m
CONFIG_IP_SET_HASH_IPPORTNET=m CONFIG_IP_SET_HASH_IPPORTNET=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m CONFIG_IP_SET_HASH_NET=m
CONFIG_IP_SET_HASH_NETNET=m
CONFIG_IP_SET_HASH_NETPORT=m CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_TABLES_IPV4=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_NAT_IPV4=m
CONFIG_NF_TABLES_ARP=m
CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m CONFIG_IP_NF_MATCH_ECN=m
...@@ -149,6 +168,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m ...@@ -149,6 +168,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_NF_NAT_IPV4=m CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_MASQUERADE=m
...@@ -163,6 +183,9 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -163,6 +183,9 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_MATCH_EUI64=m
...@@ -176,11 +199,13 @@ CONFIG_IP6_NF_MATCH_RT=m ...@@ -176,11 +199,13 @@ CONFIG_IP6_NF_MATCH_RT=m
CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_HL=m
CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_RAW=m
CONFIG_NF_NAT_IPV6=m CONFIG_NF_NAT_IPV6=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=m
CONFIG_IP_DCCP=m CONFIG_IP_DCCP=m
# CONFIG_IP_DCCP_CCID3 is not set # CONFIG_IP_DCCP_CCID3 is not set
CONFIG_SCTP_COOKIE_HMAC_SHA1=y CONFIG_SCTP_COOKIE_HMAC_SHA1=y
...@@ -188,10 +213,13 @@ CONFIG_RDS=m ...@@ -188,10 +213,13 @@ CONFIG_RDS=m
CONFIG_RDS_TCP=m CONFIG_RDS_TCP=m
CONFIG_L2TP=m CONFIG_L2TP=m
CONFIG_ATALK=m CONFIG_ATALK=m
CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y
CONFIG_NETLINK_DIAG=m
CONFIG_NET_MPLS_GSO=m
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
# CONFIG_FIRMWARE_IN_KERNEL is not set # CONFIG_FIRMWARE_IN_KERNEL is not set
# CONFIG_FW_LOADER_USER_HELPER is not set # CONFIG_FW_LOADER_USER_HELPER is not set
...@@ -203,6 +231,7 @@ CONFIG_BLK_DEV_NBD=m ...@@ -203,6 +231,7 @@ CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD=m
CONFIG_ATA_OVER_ETH=m CONFIG_ATA_OVER_ETH=m
CONFIG_DUMMY_IRQ=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_SCSI_TGT=m CONFIG_SCSI_TGT=m
...@@ -240,6 +269,7 @@ CONFIG_EQUALIZER=m ...@@ -240,6 +269,7 @@ CONFIG_EQUALIZER=m
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
CONFIG_NET_TEAM_MODE_RANDOM=m
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
...@@ -247,6 +277,7 @@ CONFIG_NETCONSOLE=m ...@@ -247,6 +277,7 @@ CONFIG_NETCONSOLE=m
CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETCONSOLE_DYNAMIC=y
CONFIG_VETH=m CONFIG_VETH=m
CONFIG_SUN3LANCE=y CONFIG_SUN3LANCE=y
# CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set # CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_VENDOR_INTEL is not set # CONFIG_NET_VENDOR_INTEL is not set
...@@ -255,6 +286,7 @@ CONFIG_SUN3LANCE=y ...@@ -255,6 +286,7 @@ CONFIG_SUN3LANCE=y
# CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_NATSEMI is not set
# CONFIG_NET_VENDOR_SEEQ is not set # CONFIG_NET_VENDOR_SEEQ is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
...@@ -276,7 +308,6 @@ CONFIG_INPUT_EVDEV=m ...@@ -276,7 +308,6 @@ CONFIG_INPUT_EVDEV=m
CONFIG_KEYBOARD_SUNKBD=y CONFIG_KEYBOARD_SUNKBD=y
# CONFIG_MOUSE_PS2 is not set # CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_SERIAL=m
CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set # CONFIG_DEVKMEM is not set
# CONFIG_HW_RANDOM is not set # CONFIG_HW_RANDOM is not set
...@@ -296,10 +327,6 @@ CONFIG_RTC_CLASS=y ...@@ -296,10 +327,6 @@ CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_GENERIC=m CONFIG_RTC_DRV_GENERIC=m
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_PROC_HARDWARE=y CONFIG_PROC_HARDWARE=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
# CONFIG_EXT3_FS_XATTR is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -336,7 +363,7 @@ CONFIG_QNX6FS_FS=m ...@@ -336,7 +363,7 @@ CONFIG_QNX6FS_FS=m
CONFIG_SYSV_FS=m CONFIG_SYSV_FS=m
CONFIG_UFS_FS=m CONFIG_UFS_FS=m
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
CONFIG_NFS_V4=y CONFIG_NFS_V4=m
CONFIG_NFS_SWAP=y CONFIG_NFS_SWAP=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
...@@ -395,10 +422,10 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -395,10 +422,10 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_STRING_HELPERS=m
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_NULL=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_CCM=m
...@@ -431,6 +458,8 @@ CONFIG_CRYPTO_TEA=m ...@@ -431,6 +458,8 @@ CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_ZLIB=m CONFIG_CRYPTO_ZLIB=m
CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m
# CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
......
arch/m68k/emu/natfeat.c
View file @ 8cf7a16e
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
* the GNU General Public License (GPL), incorporated herein by reference. * the GNU General Public License (GPL), incorporated herein by reference.
*/ */
#include <linux/init.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/string.h> #include <linux/string.h>
...@@ -70,7 +71,7 @@ static void nf_poweroff(void) ...@@ -70,7 +71,7 @@ static void nf_poweroff(void)
nf_call(id); nf_call(id);
} }
void nf_init(void) void __init nf_init(void)
{ {
unsigned long id, version; unsigned long id, version;
char buf[256]; char buf[256];
......
arch/m68k/hp300/config.c
View file @ 8cf7a16e
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
#include <linux/console.h> #include <linux/console.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/bootinfo-hp300.h>
#include <asm/byteorder.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/blinken.h> #include <asm/blinken.h>
#include <asm/io.h> /* readb() and writeb() */ #include <asm/io.h> /* readb() and writeb() */
...@@ -70,15 +72,15 @@ extern int hp300_setup_serial_console(void) __init; ...@@ -70,15 +72,15 @@ extern int hp300_setup_serial_console(void) __init;
int __init hp300_parse_bootinfo(const struct bi_record *record) int __init hp300_parse_bootinfo(const struct bi_record *record)
{ {
int unknown = 0; int unknown = 0;
const unsigned long *data = record->data; const void *data = record->data;
switch (record->tag) { switch (be16_to_cpu(record->tag)) {
case BI_HP300_MODEL: case BI_HP300_MODEL:
hp300_model = *data; hp300_model = be32_to_cpup(data);
break; break;
case BI_HP300_UART_SCODE: case BI_HP300_UART_SCODE:
hp300_uart_scode = *data; hp300_uart_scode = be32_to_cpup(data);
break; break;
case BI_HP300_UART_ADDR: case BI_HP300_UART_ADDR:
......
arch/m68k/include/asm/amigahw.h
View file @ 8cf7a16e
...@@ -18,26 +18,7 @@ ...@@ -18,26 +18,7 @@
#include <linux/ioport.h> #include <linux/ioport.h>
/* #include <asm/bootinfo-amiga.h>
* Different Amiga models
*/
#define AMI_UNKNOWN (0)
#define AMI_500 (1)
#define AMI_500PLUS (2)
#define AMI_600 (3)
#define AMI_1000 (4)
#define AMI_1200 (5)
#define AMI_2000 (6)
#define AMI_2500 (7)
#define AMI_3000 (8)
#define AMI_3000T (9)
#define AMI_3000PLUS (10)
#define AMI_4000 (11)
#define AMI_4000T (12)
#define AMI_CDTV (13)
#define AMI_CD32 (14)
#define AMI_DRACO (15)
/* /*
...@@ -46,11 +27,6 @@ ...@@ -46,11 +27,6 @@
extern unsigned long amiga_chipset; extern unsigned long amiga_chipset;
#define CS_STONEAGE (0)
#define CS_OCS (1)
#define CS_ECS (2)
#define CS_AGA (3)
/* /*
* Miscellaneous * Miscellaneous
...@@ -266,7 +242,7 @@ struct CIA { ...@@ -266,7 +242,7 @@ struct CIA {
#define zTwoBase (0x80000000) #define zTwoBase (0x80000000)
#define ZTWO_PADDR(x) (((unsigned long)(x))-zTwoBase) #define ZTWO_PADDR(x) (((unsigned long)(x))-zTwoBase)
#define ZTWO_VADDR(x) (((unsigned long)(x))+zTwoBase) #define ZTWO_VADDR(x) ((void __iomem *)(((unsigned long)(x))+zTwoBase))
#define CUSTOM_PHYSADDR (0xdff000) #define CUSTOM_PHYSADDR (0xdff000)
#define amiga_custom ((*(volatile struct CUSTOM *)(zTwoBase+CUSTOM_PHYSADDR))) #define amiga_custom ((*(volatile struct CUSTOM *)(zTwoBase+CUSTOM_PHYSADDR)))
......
arch/m68k/include/asm/apollohw.h
View file @ 8cf7a16e
...@@ -5,18 +5,11 @@ ...@@ -5,18 +5,11 @@
#include <linux/types.h> #include <linux/types.h>
/* #include <asm/bootinfo-apollo.h>
apollo models
*/
extern u_long apollo_model; extern u_long apollo_model;
#define APOLLO_UNKNOWN (0)
#define APOLLO_DN3000 (1)
#define APOLLO_DN3010 (2)
#define APOLLO_DN3500 (3)
#define APOLLO_DN4000 (4)
#define APOLLO_DN4500 (5)
/* /*
see scn2681 data sheet for more info. see scn2681 data sheet for more info.
......
arch/m68k/include/asm/atarihw.h
View file @ 8cf7a16e
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define _LINUX_ATARIHW_H_ #define _LINUX_ATARIHW_H_
#include <linux/types.h> #include <linux/types.h>
#include <asm/bootinfo.h> #include <asm/bootinfo-atari.h>
#include <asm/raw_io.h> #include <asm/raw_io.h>
extern u_long atari_mch_cookie; extern u_long atari_mch_cookie;
......
arch/m68k/include/asm/bootinfo.h
View file @ 8cf7a16e
...@@ -6,373 +6,23 @@ ...@@ -6,373 +6,23 @@
** This file is subject to the terms and conditions of the GNU General Public ** This file is subject to the terms and conditions of the GNU General Public
** License. See the file COPYING in the main directory of this archive ** License. See the file COPYING in the main directory of this archive
** for more details. ** for more details.
**
** Created 09/29/92 by Greg Harp
**
** 5/2/94 Roman Hodek:
** Added bi_atari part of the machine dependent union bi_un; for now it
** contains just a model field to distinguish between TT and Falcon.
** 26/7/96 Roman Zippel:
** Renamed to setup.h; added some useful macros to allow gcc some
** optimizations if possible.
** 5/10/96 Geert Uytterhoeven:
** Redesign of the boot information structure; renamed to bootinfo.h again
** 27/11/96 Geert Uytterhoeven:
** Backwards compatibility with bootinfo interface version 1.0
*/ */
#ifndef _M68K_BOOTINFO_H #ifndef _M68K_BOOTINFO_H
#define _M68K_BOOTINFO_H #define _M68K_BOOTINFO_H
#include <uapi/asm/bootinfo.h>
/*
* Bootinfo definitions
*
* This is an easily parsable and extendable structure containing all
* information to be passed from the bootstrap to the kernel.
*
* This way I hope to keep all future changes back/forewards compatible.
* Thus, keep your fingers crossed...
*
* This structure is copied right after the kernel bss by the bootstrap
* routine.
*/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
struct bi_record { #ifdef CONFIG_BOOTINFO_PROC
unsigned short tag; /* tag ID */ extern void save_bootinfo(const struct bi_record *bi);
unsigned short size; /* size of record (in bytes) */ #else
unsigned long data[0]; /* data */ static inline void save_bootinfo(const struct bi_record *bi) {}
};
#endif /* __ASSEMBLY__ */
/*
* Tag Definitions
*
* Machine independent tags start counting from 0x0000
* Machine dependent tags start counting from 0x8000
*/
#define BI_LAST 0x0000 /* last record (sentinel) */
#define BI_MACHTYPE 0x0001 /* machine type (u_long) */
#define BI_CPUTYPE 0x0002 /* cpu type (u_long) */
#define BI_FPUTYPE 0x0003 /* fpu type (u_long) */
#define BI_MMUTYPE 0x0004 /* mmu type (u_long) */
#define BI_MEMCHUNK 0x0005 /* memory chunk address and size */
/* (struct mem_info) */
#define BI_RAMDISK 0x0006 /* ramdisk address and size */
/* (struct mem_info) */
#define BI_COMMAND_LINE 0x0007 /* kernel command line parameters */
/* (string) */
/*
* Amiga-specific tags
*/
#define BI_AMIGA_MODEL 0x8000 /* model (u_long) */
#define BI_AMIGA_AUTOCON 0x8001 /* AutoConfig device */
/* (struct ConfigDev) */
#define BI_AMIGA_CHIP_SIZE 0x8002 /* size of Chip RAM (u_long) */
#define BI_AMIGA_VBLANK 0x8003 /* VBLANK frequency (u_char) */
#define BI_AMIGA_PSFREQ 0x8004 /* power supply frequency (u_char) */
#define BI_AMIGA_ECLOCK 0x8005 /* EClock frequency (u_long) */
#define BI_AMIGA_CHIPSET 0x8006 /* native chipset present (u_long) */
#define BI_AMIGA_SERPER 0x8007 /* serial port period (u_short) */
/*
* Atari-specific tags
*/
#define BI_ATARI_MCH_COOKIE 0x8000 /* _MCH cookie from TOS (u_long) */
#define BI_ATARI_MCH_TYPE 0x8001 /* special machine type (u_long) */
/* (values are ATARI_MACH_* defines */
/* mch_cookie values (upper word) */
#define ATARI_MCH_ST 0
#define ATARI_MCH_STE 1
#define ATARI_MCH_TT 2
#define ATARI_MCH_FALCON 3
/* mch_type values */
#define ATARI_MACH_NORMAL 0 /* no special machine type */
#define ATARI_MACH_MEDUSA 1 /* Medusa 040 */
#define ATARI_MACH_HADES 2 /* Hades 040 or 060 */
#define ATARI_MACH_AB40 3 /* Afterburner040 on Falcon */
/*
* VME-specific tags
*/
#define BI_VME_TYPE 0x8000 /* VME sub-architecture (u_long) */
#define BI_VME_BRDINFO 0x8001 /* VME board information (struct) */
/* BI_VME_TYPE codes */
#define VME_TYPE_TP34V 0x0034 /* Tadpole TP34V */
#define VME_TYPE_MVME147 0x0147 /* Motorola MVME147 */
#define VME_TYPE_MVME162 0x0162 /* Motorola MVME162 */
#define VME_TYPE_MVME166 0x0166 /* Motorola MVME166 */
#define VME_TYPE_MVME167 0x0167 /* Motorola MVME167 */
#define VME_TYPE_MVME172 0x0172 /* Motorola MVME172 */
#define VME_TYPE_MVME177 0x0177 /* Motorola MVME177 */
#define VME_TYPE_BVME4000 0x4000 /* BVM Ltd. BVME4000 */
#define VME_TYPE_BVME6000 0x6000 /* BVM Ltd. BVME6000 */
/* BI_VME_BRDINFO is a 32 byte struct as returned by the Bug code on
* Motorola VME boards. Contains board number, Bug version, board
* configuration options, etc. See include/asm/mvme16xhw.h for details.
*/
/*
* Macintosh-specific tags (all u_long)
*/
#define BI_MAC_MODEL 0x8000 /* Mac Gestalt ID (model type) */
#define BI_MAC_VADDR 0x8001 /* Mac video base address */
#define BI_MAC_VDEPTH 0x8002 /* Mac video depth */
#define BI_MAC_VROW 0x8003 /* Mac video rowbytes */
#define BI_MAC_VDIM 0x8004 /* Mac video dimensions */
#define BI_MAC_VLOGICAL 0x8005 /* Mac video logical base */
#define BI_MAC_SCCBASE 0x8006 /* Mac SCC base address */
#define BI_MAC_BTIME 0x8007 /* Mac boot time */
#define BI_MAC_GMTBIAS 0x8008 /* Mac GMT timezone offset */
#define BI_MAC_MEMSIZE 0x8009 /* Mac RAM size (sanity check) */
#define BI_MAC_CPUID 0x800a /* Mac CPU type (sanity check) */
#define BI_MAC_ROMBASE 0x800b /* Mac system ROM base address */
/*
* Macintosh hardware profile data - unused, see macintosh.h for
* reasonable type values
*/
#define BI_MAC_VIA1BASE 0x8010 /* Mac VIA1 base address (always present) */
#define BI_MAC_VIA2BASE 0x8011 /* Mac VIA2 base address (type varies) */
#define BI_MAC_VIA2TYPE 0x8012 /* Mac VIA2 type (VIA, RBV, OSS) */
#define BI_MAC_ADBTYPE 0x8013 /* Mac ADB interface type */
#define BI_MAC_ASCBASE 0x8014 /* Mac Apple Sound Chip base address */
#define BI_MAC_SCSI5380 0x8015 /* Mac NCR 5380 SCSI (base address, multi) */
#define BI_MAC_SCSIDMA 0x8016 /* Mac SCSI DMA (base address) */
#define BI_MAC_SCSI5396 0x8017 /* Mac NCR 53C96 SCSI (base address, multi) */
#define BI_MAC_IDETYPE 0x8018 /* Mac IDE interface type */
#define BI_MAC_IDEBASE 0x8019 /* Mac IDE interface base address */
#define BI_MAC_NUBUS 0x801a /* Mac Nubus type (none, regular, pseudo) */
#define BI_MAC_SLOTMASK 0x801b /* Mac Nubus slots present */
#define BI_MAC_SCCTYPE 0x801c /* Mac SCC serial type (normal, IOP) */
#define BI_MAC_ETHTYPE 0x801d /* Mac builtin ethernet type (Sonic, MACE */
#define BI_MAC_ETHBASE 0x801e /* Mac builtin ethernet base address */
#define BI_MAC_PMU 0x801f /* Mac power management / poweroff hardware */
#define BI_MAC_IOP_SWIM 0x8020 /* Mac SWIM floppy IOP */
#define BI_MAC_IOP_ADB 0x8021 /* Mac ADB IOP */
/*
* Mac: compatibility with old booter data format (temporarily)
* Fields unused with the new bootinfo can be deleted now; instead of
* adding new fields the struct might be splitted into a hardware address
* part and a hardware type part
*/
#ifndef __ASSEMBLY__
struct mac_booter_data
{
unsigned long videoaddr;
unsigned long videorow;
unsigned long videodepth;
unsigned long dimensions;
unsigned long args;
unsigned long boottime;
unsigned long gmtbias;
unsigned long bootver;
unsigned long videological;
unsigned long sccbase;
unsigned long id;
unsigned long memsize;
unsigned long serialmf;
unsigned long serialhsk;
unsigned long serialgpi;
unsigned long printmf;
unsigned long printhsk;
unsigned long printgpi;
unsigned long cpuid;
unsigned long rombase;
unsigned long adbdelay;
unsigned long timedbra;
};
extern struct mac_booter_data
mac_bi_data;
#endif #endif
/*
* Apollo-specific tags
*/
#define BI_APOLLO_MODEL 0x8000 /* model (u_long) */
/*
* HP300-specific tags
*/
#define BI_HP300_MODEL 0x8000 /* model (u_long) */
#define BI_HP300_UART_SCODE 0x8001 /* UART select code (u_long) */
#define BI_HP300_UART_ADDR 0x8002 /* phys. addr of UART (u_long) */
/*
* Stuff for bootinfo interface versioning
*
* At the start of kernel code, a 'struct bootversion' is located.
* bootstrap checks for a matching version of the interface before booting
* a kernel, to avoid user confusion if kernel and bootstrap don't work
* together :-)
*
* If incompatible changes are made to the bootinfo interface, the major
* number below should be stepped (and the minor reset to 0) for the
* appropriate machine. If a change is backward-compatible, the minor
* should be stepped. "Backwards-compatible" means that booting will work,
* but certain features may not.
*/
#define BOOTINFOV_MAGIC 0x4249561A /* 'BIV^Z' */
#define MK_BI_VERSION(major,minor) (((major)<<16)+(minor))
#define BI_VERSION_MAJOR(v) (((v) >> 16) & 0xffff)
#define BI_VERSION_MINOR(v) ((v) & 0xffff)
#ifndef __ASSEMBLY__
struct bootversion {
unsigned short branch;
unsigned long magic;
struct {
unsigned long machtype;
unsigned long version;
} machversions[0];
};
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#define AMIGA_BOOTI_VERSION MK_BI_VERSION( 2, 0 )
#define ATARI_BOOTI_VERSION MK_BI_VERSION( 2, 1 )
#define MAC_BOOTI_VERSION MK_BI_VERSION( 2, 0 )
#define MVME147_BOOTI_VERSION MK_BI_VERSION( 2, 0 )
#define MVME16x_BOOTI_VERSION MK_BI_VERSION( 2, 0 )
#define BVME6000_BOOTI_VERSION MK_BI_VERSION( 2, 0 )
#define Q40_BOOTI_VERSION MK_BI_VERSION( 2, 0 )
#define HP300_BOOTI_VERSION MK_BI_VERSION( 2, 0 )
#ifdef BOOTINFO_COMPAT_1_0
/*
* Backwards compatibility with bootinfo interface version 1.0
*/
#define COMPAT_AMIGA_BOOTI_VERSION MK_BI_VERSION( 1, 0 )
#define COMPAT_ATARI_BOOTI_VERSION MK_BI_VERSION( 1, 0 )
#define COMPAT_MAC_BOOTI_VERSION MK_BI_VERSION( 1, 0 )
#include <linux/zorro.h>
#define COMPAT_NUM_AUTO 16
struct compat_bi_Amiga {
int model;
int num_autocon;
struct ConfigDev autocon[COMPAT_NUM_AUTO];
unsigned long chip_size;
unsigned char vblank;
unsigned char psfreq;
unsigned long eclock;
unsigned long chipset;
unsigned long hw_present;
};
struct compat_bi_Atari {
unsigned long hw_present;
unsigned long mch_cookie;
};
#ifndef __ASSEMBLY__
struct compat_bi_Macintosh
{
unsigned long videoaddr;
unsigned long videorow;
unsigned long videodepth;
unsigned long dimensions;
unsigned long args;
unsigned long boottime;
unsigned long gmtbias;
unsigned long bootver;
unsigned long videological;
unsigned long sccbase;
unsigned long id;
unsigned long memsize;
unsigned long serialmf;
unsigned long serialhsk;
unsigned long serialgpi;
unsigned long printmf;
unsigned long printhsk;
unsigned long printgpi;
unsigned long cpuid;
unsigned long rombase;
unsigned long adbdelay;
unsigned long timedbra;
};
#endif
struct compat_mem_info {
unsigned long addr;
unsigned long size;
};
#define COMPAT_NUM_MEMINFO 4
#define COMPAT_CPUB_68020 0
#define COMPAT_CPUB_68030 1
#define COMPAT_CPUB_68040 2
#define COMPAT_CPUB_68060 3
#define COMPAT_FPUB_68881 5
#define COMPAT_FPUB_68882 6
#define COMPAT_FPUB_68040 7
#define COMPAT_FPUB_68060 8
#define COMPAT_CPU_68020 (1<<COMPAT_CPUB_68020)
#define COMPAT_CPU_68030 (1<<COMPAT_CPUB_68030)
#define COMPAT_CPU_68040 (1<<COMPAT_CPUB_68040)
#define COMPAT_CPU_68060 (1<<COMPAT_CPUB_68060)
#define COMPAT_CPU_MASK (31)
#define COMPAT_FPU_68881 (1<<COMPAT_FPUB_68881)
#define COMPAT_FPU_68882 (1<<COMPAT_FPUB_68882)
#define COMPAT_FPU_68040 (1<<COMPAT_FPUB_68040)
#define COMPAT_FPU_68060 (1<<COMPAT_FPUB_68060)
#define COMPAT_FPU_MASK (0xfe0)
#define COMPAT_CL_SIZE (256)
struct compat_bootinfo {
unsigned long machtype;
unsigned long cputype;
struct compat_mem_info memory[COMPAT_NUM_MEMINFO];
int num_memory;
unsigned long ramdisk_size;
unsigned long ramdisk_addr;
char command_line[COMPAT_CL_SIZE];
union {
struct compat_bi_Amiga bi_ami;
struct compat_bi_Atari bi_ata;
struct compat_bi_Macintosh bi_mac;
} bi_un;
};
#define bi_amiga bi_un.bi_ami
#define bi_atari bi_un.bi_ata
#define bi_mac bi_un.bi_mac
#endif /* BOOTINFO_COMPAT_1_0 */
#endif /* _M68K_BOOTINFO_H */ #endif /* _M68K_BOOTINFO_H */
arch/m68k/include/asm/hp300hw.h
View file @ 8cf7a16e
#ifndef _M68K_HP300HW_H #ifndef _M68K_HP300HW_H
#define _M68K_HP300HW_H #define _M68K_HP300HW_H
extern unsigned long hp300_model; #include <asm/bootinfo-hp300.h>
/* This information was taken from NetBSD */
#define HP_320 (0) /* 16MHz 68020+HP MMU+16K external cache */
#define HP_330 (1) /* 16MHz 68020+68851 MMU */
#define HP_340 (2) /* 16MHz 68030 */
#define HP_345 (3) /* 50MHz 68030+32K external cache */
#define HP_350 (4) /* 25MHz 68020+HP MMU+32K external cache */
#define HP_360 (5) /* 25MHz 68030 */
#define HP_370 (6) /* 33MHz 68030+64K external cache */
#define HP_375 (7) /* 50MHz 68030+32K external cache */
#define HP_380 (8) /* 25MHz 68040 */
#define HP_385 (9) /* 33MHz 68040 */
#define HP_400 (10) /* 50MHz 68030+32K external cache */ extern unsigned long hp300_model;
#define HP_425T (11) /* 25MHz 68040 - model 425t */
#define HP_425S (12) /* 25MHz 68040 - model 425s */
#define HP_425E (13) /* 25MHz 68040 - model 425e */
#define HP_433T (14) /* 33MHz 68040 - model 433t */
#define HP_433S (15) /* 33MHz 68040 - model 433s */
#endif /* _M68K_HP300HW_H */ #endif /* _M68K_HP300HW_H */
arch/m68k/include/asm/kexec.h 0 → 100644
View file @ 8cf7a16e
#ifndef _ASM_M68K_KEXEC_H
#define _ASM_M68K_KEXEC_H
#ifdef CONFIG_KEXEC
/* Maximum physical address we can use pages from */
#define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)
/* Maximum address we can reach in physical address mode */
#define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL)
/* Maximum address we can use for the control code buffer */
#define KEXEC_CONTROL_MEMORY_LIMIT (-1UL)
#define KEXEC_CONTROL_PAGE_SIZE 4096
#define KEXEC_ARCH KEXEC_ARCH_68K
#ifndef __ASSEMBLY__
static inline void crash_setup_regs(struct pt_regs *newregs,
struct pt_regs *oldregs)
{
/* Dummy implementation for now */
}
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_KEXEC */
#endif /* _ASM_M68K_KEXEC_H */
arch/m68k/include/asm/macintosh.h
View file @ 8cf7a16e
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/bootinfo-mac.h>
/* /*
* Apple Macintoshisms * Apple Macintoshisms
*/ */
...@@ -74,65 +77,29 @@ struct mac_model ...@@ -74,65 +77,29 @@ struct mac_model
#define MAC_FLOPPY_SWIM_IOP 3 #define MAC_FLOPPY_SWIM_IOP 3
#define MAC_FLOPPY_AV 4 #define MAC_FLOPPY_AV 4
/* extern struct mac_model *macintosh_config;
* Gestalt numbers
*/
#define MAC_MODEL_II 6
#define MAC_MODEL_IIX 7
#define MAC_MODEL_IICX 8
#define MAC_MODEL_SE30 9
#define MAC_MODEL_IICI 11
#define MAC_MODEL_IIFX 13 /* And well numbered it is too */
#define MAC_MODEL_IISI 18
#define MAC_MODEL_LC 19
#define MAC_MODEL_Q900 20
#define MAC_MODEL_PB170 21
#define MAC_MODEL_Q700 22
#define MAC_MODEL_CLII 23 /* aka: P200 */
#define MAC_MODEL_PB140 25
#define MAC_MODEL_Q950 26 /* aka: WGS95 */
#define MAC_MODEL_LCIII 27 /* aka: P450 */
#define MAC_MODEL_PB210 29
#define MAC_MODEL_C650 30
#define MAC_MODEL_PB230 32
#define MAC_MODEL_PB180 33
#define MAC_MODEL_PB160 34
#define MAC_MODEL_Q800 35 /* aka: WGS80 */
#define MAC_MODEL_Q650 36
#define MAC_MODEL_LCII 37 /* aka: P400/405/410/430 */
#define MAC_MODEL_PB250 38
#define MAC_MODEL_IIVI 44
#define MAC_MODEL_P600 45 /* aka: P600CD */
#define MAC_MODEL_IIVX 48
#define MAC_MODEL_CCL 49 /* aka: P250 */
#define MAC_MODEL_PB165C 50
#define MAC_MODEL_C610 52 /* aka: WGS60 */
#define MAC_MODEL_Q610 53
#define MAC_MODEL_PB145 54 /* aka: PB145B */
#define MAC_MODEL_P520 56 /* aka: LC520 */
#define MAC_MODEL_C660 60
#define MAC_MODEL_P460 62 /* aka: LCIII+, P466/P467 */
#define MAC_MODEL_PB180C 71
#define MAC_MODEL_PB520 72 /* aka: PB520C, PB540, PB540C, PB550C */
#define MAC_MODEL_PB270C 77
#define MAC_MODEL_Q840 78
#define MAC_MODEL_P550 80 /* aka: LC550, P560 */
#define MAC_MODEL_CCLII 83 /* aka: P275 */
#define MAC_MODEL_PB165 84
#define MAC_MODEL_PB190 85 /* aka: PB190CS */
#define MAC_MODEL_TV 88
#define MAC_MODEL_P475 89 /* aka: LC475, P476 */
#define MAC_MODEL_P475F 90 /* aka: P475 w/ FPU (no LC040) */
#define MAC_MODEL_P575 92 /* aka: LC575, P577/P578 */
#define MAC_MODEL_Q605 94
#define MAC_MODEL_Q605_ACC 95 /* Q605 accelerated to 33 MHz */
#define MAC_MODEL_Q630 98 /* aka: LC630, P630/631/635/636/637/638/640 */
#define MAC_MODEL_P588 99 /* aka: LC580, P580 */
#define MAC_MODEL_PB280 102
#define MAC_MODEL_PB280C 103
#define MAC_MODEL_PB150 115
extern struct mac_model *macintosh_config; /*
* Internal representation of the Mac hardware, filled in from bootinfo
*/
struct mac_booter_data
{
unsigned long videoaddr;
unsigned long videorow;
unsigned long videodepth;
unsigned long dimensions;
unsigned long boottime;
unsigned long gmtbias;
unsigned long videological;
unsigned long sccbase;
unsigned long id;
unsigned long memsize;
unsigned long cpuid;
unsigned long rombase;
};
extern struct mac_booter_data mac_bi_data;
#endif #endif
arch/m68k/include/asm/mc146818rtc.h
View file @ 8cf7a16e
...@@ -10,16 +10,16 @@ ...@@ -10,16 +10,16 @@
#include <asm/atarihw.h> #include <asm/atarihw.h>
#define RTC_PORT(x) (TT_RTC_BAS + 2*(x)) #define ATARI_RTC_PORT(x) (TT_RTC_BAS + 2*(x))
#define RTC_ALWAYS_BCD 0 #define RTC_ALWAYS_BCD 0
#define CMOS_READ(addr) ({ \ #define CMOS_READ(addr) ({ \
atari_outb_p((addr),RTC_PORT(0)); \ atari_outb_p((addr), ATARI_RTC_PORT(0)); \
atari_inb_p(RTC_PORT(1)); \ atari_inb_p(ATARI_RTC_PORT(1)); \
}) })
#define CMOS_WRITE(val, addr) ({ \ #define CMOS_WRITE(val, addr) ({ \
atari_outb_p((addr),RTC_PORT(0)); \ atari_outb_p((addr), ATARI_RTC_PORT(0)); \
atari_outb_p((val),RTC_PORT(1)); \ atari_outb_p((val), ATARI_RTC_PORT(1)); \
}) })
#endif /* CONFIG_ATARI */ #endif /* CONFIG_ATARI */
......
arch/m68k/include/asm/mvme16xhw.h
View file @ 8cf7a16e
...@@ -3,23 +3,6 @@ ...@@ -3,23 +3,6 @@
#include <asm/irq.h> #include <asm/irq.h>
/* Board ID data structure - pointer to this retrieved from Bug by head.S */
/* Note, bytes 12 and 13 are board no in BCD (0162,0166,0167,0177,etc) */
extern long mvme_bdid_ptr;
typedef struct {
char bdid[4];
u_char rev, mth, day, yr;
u_short size, reserved;
u_short brdno;
char brdsuffix[2];
u_long options;
u_short clun, dlun, ctype, dnum;
u_long option2;
} t_bdid, *p_bdid;
typedef struct { typedef struct {
u_char ack_icr, u_char ack_icr,
......
arch/m68k/include/asm/setup.h
View file @ 8cf7a16e
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#ifndef _M68K_SETUP_H #ifndef _M68K_SETUP_H
#define _M68K_SETUP_H #define _M68K_SETUP_H
#include <uapi/asm/bootinfo.h>
#include <uapi/asm/setup.h> #include <uapi/asm/setup.h>
...@@ -297,14 +298,14 @@ extern int m68k_is040or060; ...@@ -297,14 +298,14 @@ extern int m68k_is040or060;
#define NUM_MEMINFO 4 #define NUM_MEMINFO 4
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
struct mem_info { struct m68k_mem_info {
unsigned long addr; /* physical address of memory chunk */ unsigned long addr; /* physical address of memory chunk */
unsigned long size; /* length of memory chunk (in bytes) */ unsigned long size; /* length of memory chunk (in bytes) */
}; };
extern int m68k_num_memory; /* # of memory blocks found (and used) */ extern int m68k_num_memory; /* # of memory blocks found (and used) */
extern int m68k_realnum_memory; /* real # of memory blocks found */ extern int m68k_realnum_memory; /* real # of memory blocks found */
extern struct mem_info m68k_memory[NUM_MEMINFO];/* memory description */ extern struct m68k_mem_info m68k_memory[NUM_MEMINFO];/* memory description */
#endif #endif
#endif /* _M68K_SETUP_H */ #endif /* _M68K_SETUP_H */
arch/m68k/include/asm/timex.h
View file @ 8cf7a16e
...@@ -28,4 +28,14 @@ static inline cycles_t get_cycles(void) ...@@ -28,4 +28,14 @@ static inline cycles_t get_cycles(void)
return 0; return 0;
} }
extern unsigned long (*mach_random_get_entropy)(void);
static inline unsigned long random_get_entropy(void)
{
if (mach_random_get_entropy)
return mach_random_get_entropy();
return 0;
}
#define random_get_entropy random_get_entropy
#endif #endif
arch/m68k/include/uapi/asm/Kbuild
View file @ 8cf7a16e
...@@ -11,6 +11,14 @@ generic-y += termbits.h ...@@ -11,6 +11,14 @@ generic-y += termbits.h
generic-y += termios.h generic-y += termios.h
header-y += a.out.h header-y += a.out.h
header-y += bootinfo.h
header-y += bootinfo-amiga.h
header-y += bootinfo-apollo.h
header-y += bootinfo-atari.h
header-y += bootinfo-hp300.h
header-y += bootinfo-mac.h
header-y += bootinfo-q40.h
header-y += bootinfo-vme.h
header-y += byteorder.h header-y += byteorder.h
header-y += cachectl.h header-y += cachectl.h
header-y += fcntl.h header-y += fcntl.h
......
arch/m68k/include/uapi/asm/bootinfo-amiga.h 0 → 100644
View file @ 8cf7a16e
/*
** asm/bootinfo-amiga.h -- Amiga-specific boot information definitions
*/
#ifndef _UAPI_ASM_M68K_BOOTINFO_AMIGA_H
#define _UAPI_ASM_M68K_BOOTINFO_AMIGA_H
/*
* Amiga-specific tags
*/
#define BI_AMIGA_MODEL 0x8000 /* model (__be32) */
#define BI_AMIGA_AUTOCON 0x8001 /* AutoConfig device */
/* (AmigaOS struct ConfigDev) */
#define BI_AMIGA_CHIP_SIZE 0x8002 /* size of Chip RAM (__be32) */
#define BI_AMIGA_VBLANK 0x8003 /* VBLANK frequency (__u8) */
#define BI_AMIGA_PSFREQ 0x8004 /* power supply frequency (__u8) */
#define BI_AMIGA_ECLOCK 0x8005 /* EClock frequency (__be32) */
#define BI_AMIGA_CHIPSET 0x8006 /* native chipset present (__be32) */
#define BI_AMIGA_SERPER 0x8007 /* serial port period (__be16) */
/*
* Amiga models (BI_AMIGA_MODEL)
*/
#define AMI_UNKNOWN 0
#define AMI_500 1
#define AMI_500PLUS 2
#define AMI_600 3
#define AMI_1000 4
#define AMI_1200 5
#define AMI_2000 6
#define AMI_2500 7
#define AMI_3000 8
#define AMI_3000T 9
#define AMI_3000PLUS 10
#define AMI_4000 11
#define AMI_4000T 12
#define AMI_CDTV 13
#define AMI_CD32 14
#define AMI_DRACO 15
/*
* Amiga chipsets (BI_AMIGA_CHIPSET)
*/
#define CS_STONEAGE 0
#define CS_OCS 1
#define CS_ECS 2
#define CS_AGA 3
/*
* Latest Amiga bootinfo version
*/
#define AMIGA_BOOTI_VERSION MK_BI_VERSION(2, 0)
#endif /* _UAPI_ASM_M68K_BOOTINFO_AMIGA_H */
arch/m68k/include/uapi/asm/bootinfo-apollo.h 0 → 100644
View file @ 8cf7a16e
/*
** asm/bootinfo-apollo.h -- Apollo-specific boot information definitions
*/
#ifndef _UAPI_ASM_M68K_BOOTINFO_APOLLO_H
#define _UAPI_ASM_M68K_BOOTINFO_APOLLO_H
/*
* Apollo-specific tags
*/
#define BI_APOLLO_MODEL 0x8000 /* model (__be32) */
/*
* Apollo models (BI_APOLLO_MODEL)
*/
#define APOLLO_UNKNOWN 0
#define APOLLO_DN3000 1
#define APOLLO_DN3010 2
#define APOLLO_DN3500 3
#define APOLLO_DN4000 4
#define APOLLO_DN4500 5
#endif /* _UAPI_ASM_M68K_BOOTINFO_APOLLO_H */
arch/m68k/include/uapi/asm/bootinfo-atari.h 0 → 100644
View file @ 8cf7a16e
/*
** asm/bootinfo-atari.h -- Atari-specific boot information definitions
*/
#ifndef _UAPI_ASM_M68K_BOOTINFO_ATARI_H
#define _UAPI_ASM_M68K_BOOTINFO_ATARI_H
/*
* Atari-specific tags
*/
#define BI_ATARI_MCH_COOKIE 0x8000 /* _MCH cookie from TOS (__be32) */
#define BI_ATARI_MCH_TYPE 0x8001 /* special machine type (__be32) */
/*
* mch_cookie values (upper word of BI_ATARI_MCH_COOKIE)
*/
#define ATARI_MCH_ST 0
#define ATARI_MCH_STE 1
#define ATARI_MCH_TT 2
#define ATARI_MCH_FALCON 3
/*
* Atari machine types (BI_ATARI_MCH_TYPE)
*/
#define ATARI_MACH_NORMAL 0 /* no special machine type */
#define ATARI_MACH_MEDUSA 1 /* Medusa 040 */
#define ATARI_MACH_HADES 2 /* Hades 040 or 060 */
#define ATARI_MACH_AB40 3 /* Afterburner040 on Falcon */
/*
* Latest Atari bootinfo version
*/
#define ATARI_BOOTI_VERSION MK_BI_VERSION(2, 1)
#endif /* _UAPI_ASM_M68K_BOOTINFO_ATARI_H */
arch/m68k/include/uapi/asm/bootinfo-hp300.h 0 → 100644
View file @ 8cf7a16e
/*
** asm/bootinfo-hp300.h -- HP9000/300-specific boot information definitions
*/
#ifndef _UAPI_ASM_M68K_BOOTINFO_HP300_H
#define _UAPI_ASM_M68K_BOOTINFO_HP300_H
/*
* HP9000/300-specific tags
*/
#define BI_HP300_MODEL 0x8000 /* model (__be32) */
#define BI_HP300_UART_SCODE 0x8001 /* UART select code (__be32) */
#define BI_HP300_UART_ADDR 0x8002 /* phys. addr of UART (__be32) */
/*
* HP9000/300 and /400 models (BI_HP300_MODEL)
*
* This information was taken from NetBSD
*/
#define HP_320 0 /* 16MHz 68020+HP MMU+16K external cache */
#define HP_330 1 /* 16MHz 68020+68851 MMU */
#define HP_340 2 /* 16MHz 68030 */
#define HP_345 3 /* 50MHz 68030+32K external cache */
#define HP_350 4 /* 25MHz 68020+HP MMU+32K external cache */
#define HP_360 5 /* 25MHz 68030 */
#define HP_370 6 /* 33MHz 68030+64K external cache */
#define HP_375 7 /* 50MHz 68030+32K external cache */
#define HP_380 8 /* 25MHz 68040 */
#define HP_385 9 /* 33MHz 68040 */
#define HP_400 10 /* 50MHz 68030+32K external cache */
#define HP_425T 11 /* 25MHz 68040 - model 425t */
#define HP_425S 12 /* 25MHz 68040 - model 425s */
#define HP_425E 13 /* 25MHz 68040 - model 425e */
#define HP_433T 14 /* 33MHz 68040 - model 433t */
#define HP_433S 15 /* 33MHz 68040 - model 433s */
/*
* Latest HP9000/300 bootinfo version
*/
#define HP300_BOOTI_VERSION MK_BI_VERSION(2, 0)
#endif /* _UAPI_ASM_M68K_BOOTINFO_HP300_H */
arch/m68k/include/uapi/asm/bootinfo-mac.h 0 → 100644
View file @ 8cf7a16e
/*
** asm/bootinfo-mac.h -- Macintosh-specific boot information definitions
*/
#ifndef _UAPI_ASM_M68K_BOOTINFO_MAC_H
#define _UAPI_ASM_M68K_BOOTINFO_MAC_H
/*
* Macintosh-specific tags (all __be32)
*/
#define BI_MAC_MODEL 0x8000 /* Mac Gestalt ID (model type) */
#define BI_MAC_VADDR 0x8001 /* Mac video base address */
#define BI_MAC_VDEPTH 0x8002 /* Mac video depth */
#define BI_MAC_VROW 0x8003 /* Mac video rowbytes */
#define BI_MAC_VDIM 0x8004 /* Mac video dimensions */
#define BI_MAC_VLOGICAL 0x8005 /* Mac video logical base */
#define BI_MAC_SCCBASE 0x8006 /* Mac SCC base address */
#define BI_MAC_BTIME 0x8007 /* Mac boot time */
#define BI_MAC_GMTBIAS 0x8008 /* Mac GMT timezone offset */
#define BI_MAC_MEMSIZE 0x8009 /* Mac RAM size (sanity check) */
#define BI_MAC_CPUID 0x800a /* Mac CPU type (sanity check) */
#define BI_MAC_ROMBASE 0x800b /* Mac system ROM base address */
/*
* Macintosh hardware profile data - unused, see macintosh.h for
* reasonable type values
*/
#define BI_MAC_VIA1BASE 0x8010 /* Mac VIA1 base address (always present) */
#define BI_MAC_VIA2BASE 0x8011 /* Mac VIA2 base address (type varies) */
#define BI_MAC_VIA2TYPE 0x8012 /* Mac VIA2 type (VIA, RBV, OSS) */
#define BI_MAC_ADBTYPE 0x8013 /* Mac ADB interface type */
#define BI_MAC_ASCBASE 0x8014 /* Mac Apple Sound Chip base address */
#define BI_MAC_SCSI5380 0x8015 /* Mac NCR 5380 SCSI (base address, multi) */
#define BI_MAC_SCSIDMA 0x8016 /* Mac SCSI DMA (base address) */
#define BI_MAC_SCSI5396 0x8017 /* Mac NCR 53C96 SCSI (base address, multi) */
#define BI_MAC_IDETYPE 0x8018 /* Mac IDE interface type */
#define BI_MAC_IDEBASE 0x8019 /* Mac IDE interface base address */
#define BI_MAC_NUBUS 0x801a /* Mac Nubus type (none, regular, pseudo) */
#define BI_MAC_SLOTMASK 0x801b /* Mac Nubus slots present */
#define BI_MAC_SCCTYPE 0x801c /* Mac SCC serial type (normal, IOP) */
#define BI_MAC_ETHTYPE 0x801d /* Mac builtin ethernet type (Sonic, MACE */
#define BI_MAC_ETHBASE 0x801e /* Mac builtin ethernet base address */
#define BI_MAC_PMU 0x801f /* Mac power management / poweroff hardware */
#define BI_MAC_IOP_SWIM 0x8020 /* Mac SWIM floppy IOP */
#define BI_MAC_IOP_ADB 0x8021 /* Mac ADB IOP */
/*
* Macintosh Gestalt numbers (BI_MAC_MODEL)
*/
#define MAC_MODEL_II 6
#define MAC_MODEL_IIX 7
#define MAC_MODEL_IICX 8
#define MAC_MODEL_SE30 9
#define MAC_MODEL_IICI 11
#define MAC_MODEL_IIFX 13 /* And well numbered it is too */
#define MAC_MODEL_IISI 18
#define MAC_MODEL_LC 19
#define MAC_MODEL_Q900 20
#define MAC_MODEL_PB170 21
#define MAC_MODEL_Q700 22
#define MAC_MODEL_CLII 23 /* aka: P200 */
#define MAC_MODEL_PB140 25
#define MAC_MODEL_Q950 26 /* aka: WGS95 */
#define MAC_MODEL_LCIII 27 /* aka: P450 */
#define MAC_MODEL_PB210 29
#define MAC_MODEL_C650 30
#define MAC_MODEL_PB230 32
#define MAC_MODEL_PB180 33
#define MAC_MODEL_PB160 34
#define MAC_MODEL_Q800 35 /* aka: WGS80 */
#define MAC_MODEL_Q650 36
#define MAC_MODEL_LCII 37 /* aka: P400/405/410/430 */
#define MAC_MODEL_PB250 38
#define MAC_MODEL_IIVI 44
#define MAC_MODEL_P600 45 /* aka: P600CD */
#define MAC_MODEL_IIVX 48
#define MAC_MODEL_CCL 49 /* aka: P250 */
#define MAC_MODEL_PB165C 50
#define MAC_MODEL_C610 52 /* aka: WGS60 */
#define MAC_MODEL_Q610 53
#define MAC_MODEL_PB145 54 /* aka: PB145B */
#define MAC_MODEL_P520 56 /* aka: LC520 */
#define MAC_MODEL_C660 60
#define MAC_MODEL_P460 62 /* aka: LCIII+, P466/P467 */
#define MAC_MODEL_PB180C 71
#define MAC_MODEL_PB520 72 /* aka: PB520C, PB540, PB540C, PB550C */
#define MAC_MODEL_PB270C 77
#define MAC_MODEL_Q840 78
#define MAC_MODEL_P550 80 /* aka: LC550, P560 */
#define MAC_MODEL_CCLII 83 /* aka: P275 */
#define MAC_MODEL_PB165 84
#define MAC_MODEL_PB190 85 /* aka: PB190CS */
#define MAC_MODEL_TV 88
#define MAC_MODEL_P475 89 /* aka: LC475, P476 */
#define MAC_MODEL_P475F 90 /* aka: P475 w/ FPU (no LC040) */
#define MAC_MODEL_P575 92 /* aka: LC575, P577/P578 */
#define MAC_MODEL_Q605 94
#define MAC_MODEL_Q605_ACC 95 /* Q605 accelerated to 33 MHz */
#define MAC_MODEL_Q630 98 /* aka: LC630, P630/631/635/636/637/638/640 */
#define MAC_MODEL_P588 99 /* aka: LC580, P580 */
#define MAC_MODEL_PB280 102
#define MAC_MODEL_PB280C 103
#define MAC_MODEL_PB150 115
/*
* Latest Macintosh bootinfo version
*/
#define MAC_BOOTI_VERSION MK_BI_VERSION(2, 0)
#endif /* _UAPI_ASM_M68K_BOOTINFO_MAC_H */
arch/m68k/include/uapi/asm/bootinfo-q40.h 0 → 100644
View file @ 8cf7a16e
/*
** asm/bootinfo-q40.h -- Q40-specific boot information definitions
*/
#ifndef _UAPI_ASM_M68K_BOOTINFO_Q40_H
#define _UAPI_ASM_M68K_BOOTINFO_Q40_H
/*
* Latest Q40 bootinfo version
*/
#define Q40_BOOTI_VERSION MK_BI_VERSION(2, 0)
#endif /* _UAPI_ASM_M68K_BOOTINFO_Q40_H */
arch/m68k/include/uapi/asm/bootinfo-vme.h 0 → 100644
View file @ 8cf7a16e
/*
** asm/bootinfo-vme.h -- VME-specific boot information definitions
*/
#ifndef _UAPI_ASM_M68K_BOOTINFO_VME_H
#define _UAPI_ASM_M68K_BOOTINFO_VME_H
#include <linux/types.h>
/*
* VME-specific tags
*/
#define BI_VME_TYPE 0x8000 /* VME sub-architecture (__be32) */
#define BI_VME_BRDINFO 0x8001 /* VME board information (struct) */
/*
* VME models (BI_VME_TYPE)
*/
#define VME_TYPE_TP34V 0x0034 /* Tadpole TP34V */
#define VME_TYPE_MVME147 0x0147 /* Motorola MVME147 */
#define VME_TYPE_MVME162 0x0162 /* Motorola MVME162 */
#define VME_TYPE_MVME166 0x0166 /* Motorola MVME166 */
#define VME_TYPE_MVME167 0x0167 /* Motorola MVME167 */
#define VME_TYPE_MVME172 0x0172 /* Motorola MVME172 */
#define VME_TYPE_MVME177 0x0177 /* Motorola MVME177 */
#define VME_TYPE_BVME4000 0x4000 /* BVM Ltd. BVME4000 */
#define VME_TYPE_BVME6000 0x6000 /* BVM Ltd. BVME6000 */
#ifndef __ASSEMBLY__
/*
* Board ID data structure - pointer to this retrieved from Bug by head.S
*
* BI_VME_BRDINFO is a 32 byte struct as returned by the Bug code on
* Motorola VME boards. Contains board number, Bug version, board
* configuration options, etc.
*
* Note, bytes 12 and 13 are board no in BCD (0162,0166,0167,0177,etc)
*/
typedef struct {
char bdid[4];
__u8 rev, mth, day, yr;
__be16 size, reserved;
__be16 brdno;
char brdsuffix[2];
__be32 options;
__be16 clun, dlun, ctype, dnum;
__be32 option2;
} t_bdid, *p_bdid;
#endif /* __ASSEMBLY__ */
/*
* Latest VME bootinfo versions
*/
#define MVME147_BOOTI_VERSION MK_BI_VERSION(2, 0)
#define MVME16x_BOOTI_VERSION MK_BI_VERSION(2, 0)
#define BVME6000_BOOTI_VERSION MK_BI_VERSION(2, 0)
#endif /* _UAPI_ASM_M68K_BOOTINFO_VME_H */
arch/m68k/include/uapi/asm/bootinfo.h 0 → 100644
View file @ 8cf7a16e
/*
* asm/bootinfo.h -- Definition of the Linux/m68k boot information structure
*
* Copyright 1992 by Greg Harp
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file COPYING in the main directory of this archive
* for more details.
*/
#ifndef _UAPI_ASM_M68K_BOOTINFO_H
#define _UAPI_ASM_M68K_BOOTINFO_H
#include <linux/types.h>
#ifndef __ASSEMBLY__
/*
* Bootinfo definitions
*
* This is an easily parsable and extendable structure containing all
* information to be passed from the bootstrap to the kernel.
*
* This way I hope to keep all future changes back/forewards compatible.
* Thus, keep your fingers crossed...
*
* This structure is copied right after the kernel by the bootstrap
* routine.
*/
struct bi_record {
__be16 tag; /* tag ID */
__be16 size; /* size of record (in bytes) */
__be32 data[0]; /* data */
};
struct mem_info {
__be32 addr; /* physical address of memory chunk */
__be32 size; /* length of memory chunk (in bytes) */
};
#endif /* __ASSEMBLY__ */
/*
* Tag Definitions
*
* Machine independent tags start counting from 0x0000
* Machine dependent tags start counting from 0x8000
*/
#define BI_LAST 0x0000 /* last record (sentinel) */
#define BI_MACHTYPE 0x0001 /* machine type (__be32) */
#define BI_CPUTYPE 0x0002 /* cpu type (__be32) */
#define BI_FPUTYPE 0x0003 /* fpu type (__be32) */
#define BI_MMUTYPE 0x0004 /* mmu type (__be32) */
#define BI_MEMCHUNK 0x0005 /* memory chunk address and size */
/* (struct mem_info) */
#define BI_RAMDISK 0x0006 /* ramdisk address and size */
/* (struct mem_info) */
#define BI_COMMAND_LINE 0x0007 /* kernel command line parameters */
/* (string) */
/*
* Linux/m68k Architectures (BI_MACHTYPE)
*/
#define MACH_AMIGA 1
#define MACH_ATARI 2
#define MACH_MAC 3
#define MACH_APOLLO 4
#define MACH_SUN3 5
#define MACH_MVME147 6
#define MACH_MVME16x 7
#define MACH_BVME6000 8
#define MACH_HP300 9
#define MACH_Q40 10
#define MACH_SUN3X 11
#define MACH_M54XX 12
/*
* CPU, FPU and MMU types (BI_CPUTYPE, BI_FPUTYPE, BI_MMUTYPE)
*
* Note: we may rely on the following equalities:
*
* CPU_68020 == MMU_68851
* CPU_68030 == MMU_68030
* CPU_68040 == FPU_68040 == MMU_68040
* CPU_68060 == FPU_68060 == MMU_68060
*/
#define CPUB_68020 0
#define CPUB_68030 1
#define CPUB_68040 2
#define CPUB_68060 3
#define CPUB_COLDFIRE 4
#define CPU_68020 (1 << CPUB_68020)
#define CPU_68030 (1 << CPUB_68030)
#define CPU_68040 (1 << CPUB_68040)
#define CPU_68060 (1 << CPUB_68060)
#define CPU_COLDFIRE (1 << CPUB_COLDFIRE)
#define FPUB_68881 0
#define FPUB_68882 1
#define FPUB_68040 2 /* Internal FPU */
#define FPUB_68060 3 /* Internal FPU */
#define FPUB_SUNFPA 4 /* Sun-3 FPA */
#define FPUB_COLDFIRE 5 /* ColdFire FPU */
#define FPU_68881 (1 << FPUB_68881)
#define FPU_68882 (1 << FPUB_68882)
#define FPU_68040 (1 << FPUB_68040)
#define FPU_68060 (1 << FPUB_68060)
#define FPU_SUNFPA (1 << FPUB_SUNFPA)
#define FPU_COLDFIRE (1 << FPUB_COLDFIRE)
#define MMUB_68851 0
#define MMUB_68030 1 /* Internal MMU */
#define MMUB_68040 2 /* Internal MMU */
#define MMUB_68060 3 /* Internal MMU */
#define MMUB_APOLLO 4 /* Custom Apollo */
#define MMUB_SUN3 5 /* Custom Sun-3 */
#define MMUB_COLDFIRE 6 /* Internal MMU */
#define MMU_68851 (1 << MMUB_68851)
#define MMU_68030 (1 << MMUB_68030)
#define MMU_68040 (1 << MMUB_68040)
#define MMU_68060 (1 << MMUB_68060)
#define MMU_SUN3 (1 << MMUB_SUN3)
#define MMU_APOLLO (1 << MMUB_APOLLO)
#define MMU_COLDFIRE (1 << MMUB_COLDFIRE)
/*
* Stuff for bootinfo interface versioning
*
* At the start of kernel code, a 'struct bootversion' is located.
* bootstrap checks for a matching version of the interface before booting
* a kernel, to avoid user confusion if kernel and bootstrap don't work
* together :-)
*
* If incompatible changes are made to the bootinfo interface, the major
* number below should be stepped (and the minor reset to 0) for the
* appropriate machine. If a change is backward-compatible, the minor
* should be stepped. "Backwards-compatible" means that booting will work,
* but certain features may not.
*/
#define BOOTINFOV_MAGIC 0x4249561A /* 'BIV^Z' */
#define MK_BI_VERSION(major, minor) (((major) << 16) + (minor))
#define BI_VERSION_MAJOR(v) (((v) >> 16) & 0xffff)
#define BI_VERSION_MINOR(v) ((v) & 0xffff)
#ifndef __ASSEMBLY__
struct bootversion {
__be16 branch;
__be32 magic;
struct {
__be32 machtype;
__be32 version;
} machversions[0];
} __packed;
#endif /* __ASSEMBLY__ */
#endif /* _UAPI_ASM_M68K_BOOTINFO_H */
arch/m68k/include/uapi/asm/setup.h
View file @ 8cf7a16e
...@@ -6,98 +6,11 @@ ...@@ -6,98 +6,11 @@
** This file is subject to the terms and conditions of the GNU General Public ** This file is subject to the terms and conditions of the GNU General Public
** License. See the file COPYING in the main directory of this archive ** License. See the file COPYING in the main directory of this archive
** for more details. ** for more details.
**
** Created 09/29/92 by Greg Harp
**
** 5/2/94 Roman Hodek:
** Added bi_atari part of the machine dependent union bi_un; for now it
** contains just a model field to distinguish between TT and Falcon.
** 26/7/96 Roman Zippel:
** Renamed to setup.h; added some useful macros to allow gcc some
** optimizations if possible.
** 5/10/96 Geert Uytterhoeven:
** Redesign of the boot information structure; moved boot information
** structure to bootinfo.h
*/ */
#ifndef _UAPI_M68K_SETUP_H #ifndef _UAPI_M68K_SETUP_H
#define _UAPI_M68K_SETUP_H #define _UAPI_M68K_SETUP_H
/*
* Linux/m68k Architectures
*/
#define MACH_AMIGA 1
#define MACH_ATARI 2
#define MACH_MAC 3
#define MACH_APOLLO 4
#define MACH_SUN3 5
#define MACH_MVME147 6
#define MACH_MVME16x 7
#define MACH_BVME6000 8
#define MACH_HP300 9
#define MACH_Q40 10
#define MACH_SUN3X 11
#define MACH_M54XX 12
#define COMMAND_LINE_SIZE 256 #define COMMAND_LINE_SIZE 256
/*
* CPU, FPU and MMU types
*
* Note: we may rely on the following equalities:
*
* CPU_68020 == MMU_68851
* CPU_68030 == MMU_68030
* CPU_68040 == FPU_68040 == MMU_68040
* CPU_68060 == FPU_68060 == MMU_68060
*/
#define CPUB_68020 0
#define CPUB_68030 1
#define CPUB_68040 2
#define CPUB_68060 3
#define CPUB_COLDFIRE 4
#define CPU_68020 (1<<CPUB_68020)
#define CPU_68030 (1<<CPUB_68030)
#define CPU_68040 (1<<CPUB_68040)
#define CPU_68060 (1<<CPUB_68060)
#define CPU_COLDFIRE (1<<CPUB_COLDFIRE)
#define FPUB_68881 0
#define FPUB_68882 1
#define FPUB_68040 2 /* Internal FPU */
#define FPUB_68060 3 /* Internal FPU */
#define FPUB_SUNFPA 4 /* Sun-3 FPA */
#define FPUB_COLDFIRE 5 /* ColdFire FPU */
#define FPU_68881 (1<<FPUB_68881)
#define FPU_68882 (1<<FPUB_68882)
#define FPU_68040 (1<<FPUB_68040)
#define FPU_68060 (1<<FPUB_68060)
#define FPU_SUNFPA (1<<FPUB_SUNFPA)
#define FPU_COLDFIRE (1<<FPUB_COLDFIRE)
#define MMUB_68851 0
#define MMUB_68030 1 /* Internal MMU */
#define MMUB_68040 2 /* Internal MMU */
#define MMUB_68060 3 /* Internal MMU */
#define MMUB_APOLLO 4 /* Custom Apollo */
#define MMUB_SUN3 5 /* Custom Sun-3 */
#define MMUB_COLDFIRE 6 /* Internal MMU */
#define MMU_68851 (1<<MMUB_68851)
#define MMU_68030 (1<<MMUB_68030)
#define MMU_68040 (1<<MMUB_68040)
#define MMU_68060 (1<<MMUB_68060)
#define MMU_SUN3 (1<<MMUB_SUN3)
#define MMU_APOLLO (1<<MMUB_APOLLO)
#define MMU_COLDFIRE (1<<MMUB_COLDFIRE)
#endif /* _UAPI_M68K_SETUP_H */ #endif /* _UAPI_M68K_SETUP_H */
arch/m68k/kernel/Makefile
View file @ 8cf7a16e
...@@ -22,3 +22,6 @@ obj-$(CONFIG_PCI) += pcibios.o ...@@ -22,3 +22,6 @@ obj-$(CONFIG_PCI) += pcibios.o
obj-$(CONFIG_HAS_DMA) += dma.o obj-$(CONFIG_HAS_DMA) += dma.o
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
obj-$(CONFIG_BOOTINFO_PROC) += bootinfo_proc.o
arch/m68k/kernel/asm-offsets.c
View file @ 8cf7a16e
...@@ -98,6 +98,9 @@ int main(void) ...@@ -98,6 +98,9 @@ int main(void)
DEFINE(CIABBASE, &ciab); DEFINE(CIABBASE, &ciab);
DEFINE(C_PRA, offsetof(struct CIA, pra)); DEFINE(C_PRA, offsetof(struct CIA, pra));
DEFINE(ZTWOBASE, zTwoBase); DEFINE(ZTWOBASE, zTwoBase);
/* enum m68k_fixup_type */
DEFINE(M68K_FIXUP_MEMOFFSET, m68k_fixup_memoffset);
#endif #endif
return 0; return 0;
......
arch/m68k/kernel/bootinfo_proc.c 0 → 100644
View file @ 8cf7a16e
/*
* Based on arch/arm/kernel/atags_proc.c
*/
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/printk.h>
#include <linux/proc_fs.h>
#include <linux/slab.h>
#include <linux/string.h>
#include <asm/bootinfo.h>
#include <asm/byteorder.h>
static char bootinfo_tmp[1536] __initdata;
static void *bootinfo_copy;
static size_t bootinfo_size;
static ssize_t bootinfo_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
{
return simple_read_from_buffer(buf, count, ppos, bootinfo_copy,
bootinfo_size);
}
static const struct file_operations bootinfo_fops = {
.read = bootinfo_read,
.llseek = default_llseek,
};
void __init save_bootinfo(const struct bi_record *bi)
{
const void *start = bi;
size_t size = sizeof(bi->tag);
while (be16_to_cpu(bi->tag) != BI_LAST) {
uint16_t n = be16_to_cpu(bi->size);
size += n;
bi = (struct bi_record *)((unsigned long)bi + n);
}
if (size > sizeof(bootinfo_tmp)) {
pr_err("Cannot save %zu bytes of bootinfo\n", size);
return;
}
pr_info("Saving %zu bytes of bootinfo\n", size);
memcpy(bootinfo_tmp, start, size);
bootinfo_size = size;
}
static int __init init_bootinfo_procfs(void)
{
/*
* This cannot go into save_bootinfo() because kmalloc and proc don't
* work yet when it is called.
*/
struct proc_dir_entry *pde;
if (!bootinfo_size)
return -EINVAL;
bootinfo_copy = kmalloc(bootinfo_size, GFP_KERNEL);
if (!bootinfo_copy)
return -ENOMEM;
memcpy(bootinfo_copy, bootinfo_tmp, bootinfo_size);
pde = proc_create_data("bootinfo", 0400, NULL, &bootinfo_fops, NULL);
if (!pde) {
kfree(bootinfo_copy);
return -ENOMEM;
}
return 0;
}
arch_initcall(init_bootinfo_procfs);
arch/m68k/kernel/head.S
View file @ 8cf7a16e
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
** 98/04/25 Phil Blundell: added HP300 support ** 98/04/25 Phil Blundell: added HP300 support
** 1998/08/30 David Kilzer: Added support for font_desc structures ** 1998/08/30 David Kilzer: Added support for font_desc structures
** for linux-2.1.115 ** for linux-2.1.115
** 9/02/11 Richard Zidlicky: added Q40 support (initial vesion 99/01/01) ** 1999/02/11 Richard Zidlicky: added Q40 support (initial version 99/01/01)
** 2004/05/13 Kars de Jong: Finalised HP300 support ** 2004/05/13 Kars de Jong: Finalised HP300 support
** **
** This file is subject to the terms and conditions of the GNU General Public ** This file is subject to the terms and conditions of the GNU General Public
...@@ -257,6 +257,12 @@ ...@@ -257,6 +257,12 @@
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/init.h> #include <linux/init.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/bootinfo-amiga.h>
#include <asm/bootinfo-atari.h>
#include <asm/bootinfo-hp300.h>
#include <asm/bootinfo-mac.h>
#include <asm/bootinfo-q40.h>
#include <asm/bootinfo-vme.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/entry.h> #include <asm/entry.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
...@@ -1532,7 +1538,7 @@ L(cache_done): ...@@ -1532,7 +1538,7 @@ L(cache_done):
/* /*
* Find a tag record in the bootinfo structure * Find a tag record in the bootinfo structure
* The bootinfo structure is located right after the kernel bss * The bootinfo structure is located right after the kernel
* Returns: d0: size (-1 if not found) * Returns: d0: size (-1 if not found)
* a0: data pointer (end-of-records if not found) * a0: data pointer (end-of-records if not found)
*/ */
...@@ -2909,7 +2915,9 @@ func_start serial_init,%d0/%d1/%a0/%a1 ...@@ -2909,7 +2915,9 @@ func_start serial_init,%d0/%d1/%a0/%a1
#if defined(MAC_USE_SCC_A) || defined(MAC_USE_SCC_B) #if defined(MAC_USE_SCC_A) || defined(MAC_USE_SCC_B)
movel %pc@(L(mac_sccbase)),%a0 movel %pc@(L(mac_sccbase)),%a0
/* Reset SCC device */ /* Reset SCC register pointer */
moveb %a0@(mac_scc_cha_a_ctrl_offset),%d0
/* Reset SCC device: write register pointer then register value */
moveb #9,%a0@(mac_scc_cha_a_ctrl_offset) moveb #9,%a0@(mac_scc_cha_a_ctrl_offset)
moveb #0xc0,%a0@(mac_scc_cha_a_ctrl_offset) moveb #0xc0,%a0@(mac_scc_cha_a_ctrl_offset)
/* Wait for 5 PCLK cycles, which is about 68 CPU cycles */ /* Wait for 5 PCLK cycles, which is about 68 CPU cycles */
...@@ -3896,8 +3904,6 @@ BVME_SCC_DATA_A = 0xffb0000f ...@@ -3896,8 +3904,6 @@ BVME_SCC_DATA_A = 0xffb0000f
#endif #endif
#if defined(CONFIG_MAC) #if defined(CONFIG_MAC)
L(mac_booter_data):
.long 0
L(mac_videobase): L(mac_videobase):
.long 0 .long 0
L(mac_videodepth): L(mac_videodepth):
......
arch/m68k/kernel/machine_kexec.c 0 → 100644
View file @ 8cf7a16e
/*
* machine_kexec.c - handle transition of Linux booting another kernel
*/
#include <linux/compiler.h>
#include <linux/kexec.h>
#include <linux/mm.h>
#include <linux/delay.h>
#include <asm/cacheflush.h>
#include <asm/page.h>
#include <asm/setup.h>
extern const unsigned char relocate_new_kernel[];
extern const size_t relocate_new_kernel_size;
int machine_kexec_prepare(struct kimage *kimage)
{
return 0;
}
void machine_kexec_cleanup(struct kimage *kimage)
{
}
void machine_shutdown(void)
{
}
void machine_crash_shutdown(struct pt_regs *regs)
{
}
typedef void (*relocate_kernel_t)(unsigned long ptr,
unsigned long start,
unsigned long cpu_mmu_flags) __noreturn;
void machine_kexec(struct kimage *image)
{
void *reboot_code_buffer;
unsigned long cpu_mmu_flags;
reboot_code_buffer = page_address(image->control_code_page);
memcpy(reboot_code_buffer, relocate_new_kernel,
relocate_new_kernel_size);
/*
* we do not want to be bothered.
*/
local_irq_disable();
pr_info("Will call new kernel at 0x%08lx. Bye...\n", image->start);
__flush_cache_all();
cpu_mmu_flags = m68k_cputype | m68k_mmutype << 8;
((relocate_kernel_t) reboot_code_buffer)(image->head & PAGE_MASK,
image->start,
cpu_mmu_flags);
}
arch/m68k/kernel/relocate_kernel.S 0 → 100644
View file @ 8cf7a16e
#include <linux/linkage.h>
#include <asm/asm-offsets.h>
#include <asm/page.h>
#include <asm/setup.h>
#define MMU_BASE 8 /* MMU flags base in cpu_mmu_flags */
.text
ENTRY(relocate_new_kernel)
movel %sp@(4),%a0 /* a0 = ptr */
movel %sp@(8),%a1 /* a1 = start */
movel %sp@(12),%d1 /* d1 = cpu_mmu_flags */
movew #PAGE_MASK,%d2 /* d2 = PAGE_MASK */
/* Disable MMU */
btst #MMU_BASE + MMUB_68851,%d1
jeq 3f
1: /* 68851 or 68030 */
lea %pc@(.Lcopy),%a4
2: addl #0x00000000,%a4 /* virt_to_phys() */
.section ".m68k_fixup","aw"
.long M68K_FIXUP_MEMOFFSET, 2b+2
.previous
.chip 68030
pmove %tc,%d0 /* Disable MMU */
bclr #7,%d0
pmove %d0,%tc
jmp %a4@ /* Jump to physical .Lcopy */
.chip 68k
3:
btst #MMU_BASE + MMUB_68030,%d1
jne 1b
btst #MMU_BASE + MMUB_68040,%d1
jeq 6f
4: /* 68040 or 68060 */
lea %pc@(.Lcont040),%a4
5: addl #0x00000000,%a4 /* virt_to_phys() */
.section ".m68k_fixup","aw"
.long M68K_FIXUP_MEMOFFSET, 5b+2
.previous
movel %a4,%d0
andl #0xff000000,%d0
orw #0xe020,%d0 /* Map 16 MiB, enable, cacheable */
.chip 68040
movec %d0,%itt0
movec %d0,%dtt0
.chip 68k
jmp %a4@ /* Jump to physical .Lcont040 */
.Lcont040:
moveq #0,%d0
.chip 68040
movec %d0,%tc /* Disable MMU */
movec %d0,%itt0
movec %d0,%itt1
movec %d0,%dtt0
movec %d0,%dtt1
.chip 68k
jra .Lcopy
6:
btst #MMU_BASE + MMUB_68060,%d1
jne 4b
.Lcopy:
movel %a0@+,%d0 /* d0 = entry = *ptr */
jeq .Lflush
btst #2,%d0 /* entry & IND_DONE? */
jne .Lflush
btst #1,%d0 /* entry & IND_INDIRECTION? */
jeq 1f
andw %d2,%d0
movel %d0,%a0 /* ptr = entry & PAGE_MASK */
jra .Lcopy
1:
btst #0,%d0 /* entry & IND_DESTINATION? */
jeq 2f
andw %d2,%d0
movel %d0,%a2 /* a2 = dst = entry & PAGE_MASK */
jra .Lcopy
2:
btst #3,%d0 /* entry & IND_SOURCE? */
jeq .Lcopy
andw %d2,%d0
movel %d0,%a3 /* a3 = src = entry & PAGE_MASK */
movew #PAGE_SIZE/32 - 1,%d0 /* d0 = PAGE_SIZE/32 - 1 */
3:
movel %a3@+,%a2@+ /* *dst++ = *src++ */
movel %a3@+,%a2@+ /* *dst++ = *src++ */
movel %a3@+,%a2@+ /* *dst++ = *src++ */
movel %a3@+,%a2@+ /* *dst++ = *src++ */
movel %a3@+,%a2@+ /* *dst++ = *src++ */
movel %a3@+,%a2@+ /* *dst++ = *src++ */
movel %a3@+,%a2@+ /* *dst++ = *src++ */
movel %a3@+,%a2@+ /* *dst++ = *src++ */
dbf %d0, 3b
jra .Lcopy
.Lflush:
/* Flush all caches */
btst #CPUB_68020,%d1
jeq 2f
1: /* 68020 or 68030 */
.chip 68030
movec %cacr,%d0
orw #0x808,%d0
movec %d0,%cacr
.chip 68k
jra .Lreincarnate
2:
btst #CPUB_68030,%d1
jne 1b
btst #CPUB_68040,%d1
jeq 4f
3: /* 68040 or 68060 */
.chip 68040
nop
cpusha %bc
nop
cinva %bc
nop
.chip 68k
jra .Lreincarnate
4:
btst #CPUB_68060,%d1
jne 3b
.Lreincarnate:
jmp %a1@
relocate_new_kernel_end:
ENTRY(relocate_new_kernel_size)
.long relocate_new_kernel_end - relocate_new_kernel
arch/m68k/kernel/setup_mm.c
View file @ 8cf7a16e
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/initrd.h> #include <linux/initrd.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/byteorder.h>
#include <asm/sections.h> #include <asm/sections.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/fpu.h> #include <asm/fpu.h>
...@@ -71,12 +72,12 @@ EXPORT_SYMBOL(m68k_num_memory); ...@@ -71,12 +72,12 @@ EXPORT_SYMBOL(m68k_num_memory);
int m68k_realnum_memory; int m68k_realnum_memory;
EXPORT_SYMBOL(m68k_realnum_memory); EXPORT_SYMBOL(m68k_realnum_memory);
unsigned long m68k_memoffset; unsigned long m68k_memoffset;
struct mem_info m68k_memory[NUM_MEMINFO]; struct m68k_mem_info m68k_memory[NUM_MEMINFO];
EXPORT_SYMBOL(m68k_memory); EXPORT_SYMBOL(m68k_memory);
struct mem_info m68k_ramdisk; static struct m68k_mem_info m68k_ramdisk __initdata;
static char m68k_command_line[CL_SIZE]; static char m68k_command_line[CL_SIZE] __initdata;
void (*mach_sched_init) (irq_handler_t handler) __initdata = NULL; void (*mach_sched_init) (irq_handler_t handler) __initdata = NULL;
/* machine dependent irq functions */ /* machine dependent irq functions */
...@@ -143,11 +144,16 @@ extern void paging_init(void); ...@@ -143,11 +144,16 @@ extern void paging_init(void);
static void __init m68k_parse_bootinfo(const struct bi_record *record) static void __init m68k_parse_bootinfo(const struct bi_record *record)
{ {
while (record->tag != BI_LAST) { uint16_t tag;
save_bootinfo(record);
while ((tag = be16_to_cpu(record->tag)) != BI_LAST) {
int unknown = 0; int unknown = 0;
const unsigned long *data = record->data; const void *data = record->data;
uint16_t size = be16_to_cpu(record->size);
switch (record->tag) { switch (tag) {
case BI_MACHTYPE: case BI_MACHTYPE:
case BI_CPUTYPE: case BI_CPUTYPE:
case BI_FPUTYPE: case BI_FPUTYPE:
...@@ -157,20 +163,27 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record) ...@@ -157,20 +163,27 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record)
case BI_MEMCHUNK: case BI_MEMCHUNK:
if (m68k_num_memory < NUM_MEMINFO) { if (m68k_num_memory < NUM_MEMINFO) {
m68k_memory[m68k_num_memory].addr = data[0]; const struct mem_info *m = data;
m68k_memory[m68k_num_memory].size = data[1]; m68k_memory[m68k_num_memory].addr =
be32_to_cpu(m->addr);
m68k_memory[m68k_num_memory].size =
be32_to_cpu(m->size);
m68k_num_memory++; m68k_num_memory++;
} else } else
printk("m68k_parse_bootinfo: too many memory chunks\n"); pr_warn("%s: too many memory chunks\n",
__func__);
break; break;
case BI_RAMDISK: case BI_RAMDISK:
m68k_ramdisk.addr = data[0]; {
m68k_ramdisk.size = data[1]; const struct mem_info *m = data;
m68k_ramdisk.addr = be32_to_cpu(m->addr);
m68k_ramdisk.size = be32_to_cpu(m->size);
}
break; break;
case BI_COMMAND_LINE: case BI_COMMAND_LINE:
strlcpy(m68k_command_line, (const char *)data, strlcpy(m68k_command_line, data,
sizeof(m68k_command_line)); sizeof(m68k_command_line));
break; break;
...@@ -197,17 +210,16 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record) ...@@ -197,17 +210,16 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record)
unknown = 1; unknown = 1;
} }
if (unknown) if (unknown)
printk("m68k_parse_bootinfo: unknown tag 0x%04x ignored\n", pr_warn("%s: unknown tag 0x%04x ignored\n", __func__,
record->tag); tag);
record = (struct bi_record *)((unsigned long)record + record = (struct bi_record *)((unsigned long)record + size);
record->size);
} }
m68k_realnum_memory = m68k_num_memory; m68k_realnum_memory = m68k_num_memory;
#ifdef CONFIG_SINGLE_MEMORY_CHUNK #ifdef CONFIG_SINGLE_MEMORY_CHUNK
if (m68k_num_memory > 1) { if (m68k_num_memory > 1) {
printk("Ignoring last %i chunks of physical memory\n", pr_warn("%s: ignoring last %i chunks of physical memory\n",
(m68k_num_memory - 1)); __func__, (m68k_num_memory - 1));
m68k_num_memory = 1; m68k_num_memory = 1;
} }
#endif #endif
...@@ -219,7 +231,7 @@ void __init setup_arch(char **cmdline_p) ...@@ -219,7 +231,7 @@ void __init setup_arch(char **cmdline_p)
int i; int i;
#endif #endif
/* The bootinfo is located right after the kernel bss */ /* The bootinfo is located right after the kernel */
if (!CPU_IS_COLDFIRE) if (!CPU_IS_COLDFIRE)
m68k_parse_bootinfo((const struct bi_record *)_end); m68k_parse_bootinfo((const struct bi_record *)_end);
...@@ -247,7 +259,7 @@ void __init setup_arch(char **cmdline_p) ...@@ -247,7 +259,7 @@ void __init setup_arch(char **cmdline_p)
asm (".chip 68060; movec %%pcr,%0; .chip 68k" asm (".chip 68060; movec %%pcr,%0; .chip 68k"
: "=d" (pcr)); : "=d" (pcr));
if (((pcr >> 8) & 0xff) <= 5) { if (((pcr >> 8) & 0xff) <= 5) {
printk("Enabling workaround for errata I14\n"); pr_warn("Enabling workaround for errata I14\n");
asm (".chip 68060; movec %0,%%pcr; .chip 68k" asm (".chip 68060; movec %0,%%pcr; .chip 68k"
: : "d" (pcr | 0x20)); : : "d" (pcr | 0x20));
} }
...@@ -336,12 +348,12 @@ void __init setup_arch(char **cmdline_p) ...@@ -336,12 +348,12 @@ void __init setup_arch(char **cmdline_p)
panic("No configuration setup"); panic("No configuration setup");
} }
paging_init();
#ifdef CONFIG_NATFEAT #ifdef CONFIG_NATFEAT
nf_init(); nf_init();
#endif #endif
paging_init();
#ifndef CONFIG_SUN3 #ifndef CONFIG_SUN3
for (i = 1; i < m68k_num_memory; i++) for (i = 1; i < m68k_num_memory; i++)
free_bootmem_node(NODE_DATA(i), m68k_memory[i].addr, free_bootmem_node(NODE_DATA(i), m68k_memory[i].addr,
...@@ -353,7 +365,7 @@ void __init setup_arch(char **cmdline_p) ...@@ -353,7 +365,7 @@ void __init setup_arch(char **cmdline_p)
BOOTMEM_DEFAULT); BOOTMEM_DEFAULT);
initrd_start = (unsigned long)phys_to_virt(m68k_ramdisk.addr); initrd_start = (unsigned long)phys_to_virt(m68k_ramdisk.addr);
initrd_end = initrd_start + m68k_ramdisk.size; initrd_end = initrd_start + m68k_ramdisk.size;
printk("initrd: %08lx - %08lx\n", initrd_start, initrd_end); pr_info("initrd: %08lx - %08lx\n", initrd_start, initrd_end);
} }
#endif #endif
...@@ -538,9 +550,9 @@ void check_bugs(void) ...@@ -538,9 +550,9 @@ void check_bugs(void)
{ {
#ifndef CONFIG_M68KFPU_EMU #ifndef CONFIG_M68KFPU_EMU
if (m68k_fputype == 0) { if (m68k_fputype == 0) {
printk(KERN_EMERG "*** YOU DO NOT HAVE A FLOATING POINT UNIT, " pr_emerg("*** YOU DO NOT HAVE A FLOATING POINT UNIT, "
"WHICH IS REQUIRED BY LINUX/M68K ***\n"); "WHICH IS REQUIRED BY LINUX/M68K ***\n");
printk(KERN_EMERG "Upgrade your hardware or join the FPU " pr_emerg("Upgrade your hardware or join the FPU "
"emulation project\n"); "emulation project\n");
panic("no FPU"); panic("no FPU");
} }
......
arch/m68k/kernel/time.c
View file @ 8cf7a16e
...@@ -28,6 +28,10 @@ ...@@ -28,6 +28,10 @@
#include <linux/timex.h> #include <linux/timex.h>
#include <linux/profile.h> #include <linux/profile.h>
unsigned long (*mach_random_get_entropy)(void);
/* /*
* timer_interrupt() needs to keep up the real-time clock, * timer_interrupt() needs to keep up the real-time clock,
* as well as call the "xtime_update()" routine every clocktick * as well as call the "xtime_update()" routine every clocktick
......
arch/m68k/kernel/traps.c
View file @ 8cf7a16e
...@@ -133,9 +133,7 @@ static inline void access_error060 (struct frame *fp) ...@@ -133,9 +133,7 @@ static inline void access_error060 (struct frame *fp)
{ {
unsigned long fslw = fp->un.fmt4.pc; /* is really FSLW for access error */ unsigned long fslw = fp->un.fmt4.pc; /* is really FSLW for access error */
#ifdef DEBUG pr_debug("fslw=%#lx, fa=%#lx\n", fslw, fp->un.fmt4.effaddr);
printk("fslw=%#lx, fa=%#lx\n", fslw, fp->un.fmt4.effaddr);
#endif
if (fslw & MMU060_BPE) { if (fslw & MMU060_BPE) {
/* branch prediction error -> clear branch cache */ /* branch prediction error -> clear branch cache */
...@@ -162,9 +160,7 @@ static inline void access_error060 (struct frame *fp) ...@@ -162,9 +160,7 @@ static inline void access_error060 (struct frame *fp)
} }
if (fslw & MMU060_W) if (fslw & MMU060_W)
errorcode |= 2; errorcode |= 2;
#ifdef DEBUG pr_debug("errorcode = %ld\n", errorcode);
printk("errorcode = %d\n", errorcode );
#endif
do_page_fault(&fp->ptregs, addr, errorcode); do_page_fault(&fp->ptregs, addr, errorcode);
} else if (fslw & (MMU060_SEE)){ } else if (fslw & (MMU060_SEE)){
/* Software Emulation Error. /* Software Emulation Error.
...@@ -173,8 +169,9 @@ static inline void access_error060 (struct frame *fp) ...@@ -173,8 +169,9 @@ static inline void access_error060 (struct frame *fp)
send_fault_sig(&fp->ptregs); send_fault_sig(&fp->ptregs);
} else if (!(fslw & (MMU060_RE|MMU060_WE)) || } else if (!(fslw & (MMU060_RE|MMU060_WE)) ||
send_fault_sig(&fp->ptregs) > 0) { send_fault_sig(&fp->ptregs) > 0) {
printk("pc=%#lx, fa=%#lx\n", fp->ptregs.pc, fp->un.fmt4.effaddr); pr_err("pc=%#lx, fa=%#lx\n", fp->ptregs.pc,
printk( "68060 access error, fslw=%lx\n", fslw ); fp->un.fmt4.effaddr);
pr_err("68060 access error, fslw=%lx\n", fslw);
trap_c( fp ); trap_c( fp );
} }
} }
...@@ -225,9 +222,7 @@ static inline int do_040writeback1(unsigned short wbs, unsigned long wba, ...@@ -225,9 +222,7 @@ static inline int do_040writeback1(unsigned short wbs, unsigned long wba,
set_fs(old_fs); set_fs(old_fs);
#ifdef DEBUG pr_debug("do_040writeback1, res=%d\n", res);
printk("do_040writeback1, res=%d\n",res);
#endif
return res; return res;
} }
...@@ -249,7 +244,7 @@ static inline void do_040writebacks(struct frame *fp) ...@@ -249,7 +244,7 @@ static inline void do_040writebacks(struct frame *fp)
int res = 0; int res = 0;
#if 0 #if 0
if (fp->un.fmt7.wb1s & WBV_040) if (fp->un.fmt7.wb1s & WBV_040)
printk("access_error040: cannot handle 1st writeback. oops.\n"); pr_err("access_error040: cannot handle 1st writeback. oops.\n");
#endif #endif
if ((fp->un.fmt7.wb2s & WBV_040) && if ((fp->un.fmt7.wb2s & WBV_040) &&
...@@ -302,14 +297,12 @@ static inline void access_error040(struct frame *fp) ...@@ -302,14 +297,12 @@ static inline void access_error040(struct frame *fp)
unsigned short ssw = fp->un.fmt7.ssw; unsigned short ssw = fp->un.fmt7.ssw;
unsigned long mmusr; unsigned long mmusr;
#ifdef DEBUG pr_debug("ssw=%#x, fa=%#lx\n", ssw, fp->un.fmt7.faddr);
printk("ssw=%#x, fa=%#lx\n", ssw, fp->un.fmt7.faddr); pr_debug("wb1s=%#x, wb2s=%#x, wb3s=%#x\n", fp->un.fmt7.wb1s,
printk("wb1s=%#x, wb2s=%#x, wb3s=%#x\n", fp->un.fmt7.wb1s,
fp->un.fmt7.wb2s, fp->un.fmt7.wb3s); fp->un.fmt7.wb2s, fp->un.fmt7.wb3s);
printk ("wb2a=%lx, wb3a=%lx, wb2d=%lx, wb3d=%lx\n", pr_debug("wb2a=%lx, wb3a=%lx, wb2d=%lx, wb3d=%lx\n",
fp->un.fmt7.wb2a, fp->un.fmt7.wb3a, fp->un.fmt7.wb2a, fp->un.fmt7.wb3a,
fp->un.fmt7.wb2d, fp->un.fmt7.wb3d); fp->un.fmt7.wb2d, fp->un.fmt7.wb3d);
#endif
if (ssw & ATC_040) { if (ssw & ATC_040) {
unsigned long addr = fp->un.fmt7.faddr; unsigned long addr = fp->un.fmt7.faddr;
...@@ -324,9 +317,7 @@ static inline void access_error040(struct frame *fp) ...@@ -324,9 +317,7 @@ static inline void access_error040(struct frame *fp)
/* MMU error, get the MMUSR info for this access */ /* MMU error, get the MMUSR info for this access */
mmusr = probe040(!(ssw & RW_040), addr, ssw); mmusr = probe040(!(ssw & RW_040), addr, ssw);
#ifdef DEBUG pr_debug("mmusr = %lx\n", mmusr);
printk("mmusr = %lx\n", mmusr);
#endif
errorcode = 1; errorcode = 1;
if (!(mmusr & MMU_R_040)) { if (!(mmusr & MMU_R_040)) {
/* clear the invalid atc entry */ /* clear the invalid atc entry */
...@@ -340,14 +331,10 @@ static inline void access_error040(struct frame *fp) ...@@ -340,14 +331,10 @@ static inline void access_error040(struct frame *fp)
errorcode |= 2; errorcode |= 2;
if (do_page_fault(&fp->ptregs, addr, errorcode)) { if (do_page_fault(&fp->ptregs, addr, errorcode)) {
#ifdef DEBUG pr_debug("do_page_fault() !=0\n");
printk("do_page_fault() !=0\n");
#endif
if (user_mode(&fp->ptregs)){ if (user_mode(&fp->ptregs)){
/* delay writebacks after signal delivery */ /* delay writebacks after signal delivery */
#ifdef DEBUG pr_debug(".. was usermode - return\n");
printk(".. was usermode - return\n");
#endif
return; return;
} }
/* disable writeback into user space from kernel /* disable writeback into user space from kernel
...@@ -355,9 +342,7 @@ static inline void access_error040(struct frame *fp) ...@@ -355,9 +342,7 @@ static inline void access_error040(struct frame *fp)
* the writeback won't do good) * the writeback won't do good)
*/ */
disable_wb: disable_wb:
#ifdef DEBUG pr_debug(".. disabling wb2\n");
printk(".. disabling wb2\n");
#endif
if (fp->un.fmt7.wb2a == fp->un.fmt7.faddr) if (fp->un.fmt7.wb2a == fp->un.fmt7.faddr)
fp->un.fmt7.wb2s &= ~WBV_040; fp->un.fmt7.wb2s &= ~WBV_040;
if (fp->un.fmt7.wb3a == fp->un.fmt7.faddr) if (fp->un.fmt7.wb3a == fp->un.fmt7.faddr)
...@@ -371,7 +356,7 @@ static inline void access_error040(struct frame *fp) ...@@ -371,7 +356,7 @@ static inline void access_error040(struct frame *fp)
current->thread.signo = SIGBUS; current->thread.signo = SIGBUS;
current->thread.faddr = fp->un.fmt7.faddr; current->thread.faddr = fp->un.fmt7.faddr;
if (send_fault_sig(&fp->ptregs) >= 0) if (send_fault_sig(&fp->ptregs) >= 0)
printk("68040 bus error (ssw=%x, faddr=%lx)\n", ssw, pr_err("68040 bus error (ssw=%x, faddr=%lx)\n", ssw,
fp->un.fmt7.faddr); fp->un.fmt7.faddr);
goto disable_wb; goto disable_wb;
} }
...@@ -394,19 +379,17 @@ static inline void bus_error030 (struct frame *fp) ...@@ -394,19 +379,17 @@ static inline void bus_error030 (struct frame *fp)
unsigned short ssw = fp->un.fmtb.ssw; unsigned short ssw = fp->un.fmtb.ssw;
extern unsigned long _sun3_map_test_start, _sun3_map_test_end; extern unsigned long _sun3_map_test_start, _sun3_map_test_end;
#ifdef DEBUG
if (ssw & (FC | FB)) if (ssw & (FC | FB))
printk ("Instruction fault at %#010lx\n", pr_debug("Instruction fault at %#010lx\n",
ssw & FC ? ssw & FC ?
fp->ptregs.format == 0xa ? fp->ptregs.pc + 2 : fp->un.fmtb.baddr - 2 fp->ptregs.format == 0xa ? fp->ptregs.pc + 2 : fp->un.fmtb.baddr - 2
: :
fp->ptregs.format == 0xa ? fp->ptregs.pc + 4 : fp->un.fmtb.baddr); fp->ptregs.format == 0xa ? fp->ptregs.pc + 4 : fp->un.fmtb.baddr);
if (ssw & DF) if (ssw & DF)
printk ("Data %s fault at %#010lx in %s (pc=%#lx)\n", pr_debug("Data %s fault at %#010lx in %s (pc=%#lx)\n",
ssw & RW ? "read" : "write", ssw & RW ? "read" : "write",
fp->un.fmtb.daddr, fp->un.fmtb.daddr,
space_names[ssw & DFC], fp->ptregs.pc); space_names[ssw & DFC], fp->ptregs.pc);
#endif
/* /*
* Check if this page should be demand-mapped. This needs to go before * Check if this page should be demand-mapped. This needs to go before
...@@ -429,7 +412,7 @@ static inline void bus_error030 (struct frame *fp) ...@@ -429,7 +412,7 @@ static inline void bus_error030 (struct frame *fp)
return; return;
/* instruction fault or kernel data fault! */ /* instruction fault or kernel data fault! */
if (ssw & (FC | FB)) if (ssw & (FC | FB))
printk ("Instruction fault at %#010lx\n", pr_err("Instruction fault at %#010lx\n",
fp->ptregs.pc); fp->ptregs.pc);
if (ssw & DF) { if (ssw & DF) {
/* was this fault incurred testing bus mappings? */ /* was this fault incurred testing bus mappings? */
...@@ -439,12 +422,12 @@ static inline void bus_error030 (struct frame *fp) ...@@ -439,12 +422,12 @@ static inline void bus_error030 (struct frame *fp)
return; return;
} }
printk ("Data %s fault at %#010lx in %s (pc=%#lx)\n", pr_err("Data %s fault at %#010lx in %s (pc=%#lx)\n",
ssw & RW ? "read" : "write", ssw & RW ? "read" : "write",
fp->un.fmtb.daddr, fp->un.fmtb.daddr,
space_names[ssw & DFC], fp->ptregs.pc); space_names[ssw & DFC], fp->ptregs.pc);
} }
printk ("BAD KERNEL BUSERR\n"); pr_err("BAD KERNEL BUSERR\n");
die_if_kernel("Oops", &fp->ptregs,0); die_if_kernel("Oops", &fp->ptregs,0);
force_sig(SIGKILL, current); force_sig(SIGKILL, current);
...@@ -473,12 +456,11 @@ static inline void bus_error030 (struct frame *fp) ...@@ -473,12 +456,11 @@ static inline void bus_error030 (struct frame *fp)
else if (buserr_type & SUN3_BUSERR_INVALID) else if (buserr_type & SUN3_BUSERR_INVALID)
errorcode = 0x00; errorcode = 0x00;
else { else {
#ifdef DEBUG pr_debug("*** unexpected busfault type=%#04x\n",
printk ("*** unexpected busfault type=%#04x\n", buserr_type); buserr_type);
printk ("invalid %s access at %#lx from pc %#lx\n", pr_debug("invalid %s access at %#lx from pc %#lx\n",
!(ssw & RW) ? "write" : "read", addr, !(ssw & RW) ? "write" : "read", addr,
fp->ptregs.pc); fp->ptregs.pc);
#endif
die_if_kernel ("Oops", &fp->ptregs, buserr_type); die_if_kernel ("Oops", &fp->ptregs, buserr_type);
force_sig (SIGBUS, current); force_sig (SIGBUS, current);
return; return;
...@@ -509,9 +491,7 @@ static inline void bus_error030 (struct frame *fp) ...@@ -509,9 +491,7 @@ static inline void bus_error030 (struct frame *fp)
if (!mmu_emu_handle_fault(addr, 1, 0)) if (!mmu_emu_handle_fault(addr, 1, 0))
do_page_fault (&fp->ptregs, addr, 0); do_page_fault (&fp->ptregs, addr, 0);
} else { } else {
#ifdef DEBUG pr_debug("protection fault on insn access (segv).\n");
printk ("protection fault on insn access (segv).\n");
#endif
force_sig (SIGSEGV, current); force_sig (SIGSEGV, current);
} }
} }
...@@ -525,22 +505,22 @@ static inline void bus_error030 (struct frame *fp) ...@@ -525,22 +505,22 @@ static inline void bus_error030 (struct frame *fp)
unsigned short ssw = fp->un.fmtb.ssw; unsigned short ssw = fp->un.fmtb.ssw;
#ifdef DEBUG #ifdef DEBUG
unsigned long desc; unsigned long desc;
#endif
printk ("pid = %x ", current->pid); pr_debug("pid = %x ", current->pid);
printk ("SSW=%#06x ", ssw); pr_debug("SSW=%#06x ", ssw);
if (ssw & (FC | FB)) if (ssw & (FC | FB))
printk ("Instruction fault at %#010lx\n", pr_debug("Instruction fault at %#010lx\n",
ssw & FC ? ssw & FC ?
fp->ptregs.format == 0xa ? fp->ptregs.pc + 2 : fp->un.fmtb.baddr - 2 fp->ptregs.format == 0xa ? fp->ptregs.pc + 2 : fp->un.fmtb.baddr - 2
: :
fp->ptregs.format == 0xa ? fp->ptregs.pc + 4 : fp->un.fmtb.baddr); fp->ptregs.format == 0xa ? fp->ptregs.pc + 4 : fp->un.fmtb.baddr);
if (ssw & DF) if (ssw & DF)
printk ("Data %s fault at %#010lx in %s (pc=%#lx)\n", pr_debug("Data %s fault at %#010lx in %s (pc=%#lx)\n",
ssw & RW ? "read" : "write", ssw & RW ? "read" : "write",
fp->un.fmtb.daddr, fp->un.fmtb.daddr,
space_names[ssw & DFC], fp->ptregs.pc); space_names[ssw & DFC], fp->ptregs.pc);
#endif
/* ++andreas: If a data fault and an instruction fault happen /* ++andreas: If a data fault and an instruction fault happen
at the same time map in both pages. */ at the same time map in both pages. */
...@@ -554,27 +534,23 @@ static inline void bus_error030 (struct frame *fp) ...@@ -554,27 +534,23 @@ static inline void bus_error030 (struct frame *fp)
"pmove %%psr,%1" "pmove %%psr,%1"
: "=a&" (desc), "=m" (temp) : "=a&" (desc), "=m" (temp)
: "a" (addr), "d" (ssw)); : "a" (addr), "d" (ssw));
pr_debug("mmusr is %#x for addr %#lx in task %p\n",
temp, addr, current);
pr_debug("descriptor address is 0x%p, contents %#lx\n",
__va(desc), *(unsigned long *)__va(desc));
#else #else
asm volatile ("ptestr %2,%1@,#7\n\t" asm volatile ("ptestr %2,%1@,#7\n\t"
"pmove %%psr,%0" "pmove %%psr,%0"
: "=m" (temp) : "a" (addr), "d" (ssw)); : "=m" (temp) : "a" (addr), "d" (ssw));
#endif #endif
mmusr = temp; mmusr = temp;
#ifdef DEBUG
printk("mmusr is %#x for addr %#lx in task %p\n",
mmusr, addr, current);
printk("descriptor address is %#lx, contents %#lx\n",
__va(desc), *(unsigned long *)__va(desc));
#endif
errorcode = (mmusr & MMU_I) ? 0 : 1; errorcode = (mmusr & MMU_I) ? 0 : 1;
if (!(ssw & RW) || (ssw & RM)) if (!(ssw & RW) || (ssw & RM))
errorcode |= 2; errorcode |= 2;
if (mmusr & (MMU_I | MMU_WP)) { if (mmusr & (MMU_I | MMU_WP)) {
if (ssw & 4) { if (ssw & 4) {
printk("Data %s fault at %#010lx in %s (pc=%#lx)\n", pr_err("Data %s fault at %#010lx in %s (pc=%#lx)\n",
ssw & RW ? "read" : "write", ssw & RW ? "read" : "write",
fp->un.fmtb.daddr, fp->un.fmtb.daddr,
space_names[ssw & DFC], fp->ptregs.pc); space_names[ssw & DFC], fp->ptregs.pc);
...@@ -587,9 +563,10 @@ static inline void bus_error030 (struct frame *fp) ...@@ -587,9 +563,10 @@ static inline void bus_error030 (struct frame *fp)
} else if (!(mmusr & MMU_I)) { } else if (!(mmusr & MMU_I)) {
/* probably a 020 cas fault */ /* probably a 020 cas fault */
if (!(ssw & RM) && send_fault_sig(&fp->ptregs) > 0) if (!(ssw & RM) && send_fault_sig(&fp->ptregs) > 0)
printk("unexpected bus error (%#x,%#x)\n", ssw, mmusr); pr_err("unexpected bus error (%#x,%#x)\n", ssw,
mmusr);
} else if (mmusr & (MMU_B|MMU_L|MMU_S)) { } else if (mmusr & (MMU_B|MMU_L|MMU_S)) {
printk("invalid %s access at %#lx from pc %#lx\n", pr_err("invalid %s access at %#lx from pc %#lx\n",
!(ssw & RW) ? "write" : "read", addr, !(ssw & RW) ? "write" : "read", addr,
fp->ptregs.pc); fp->ptregs.pc);
die_if_kernel("Oops",&fp->ptregs,mmusr); die_if_kernel("Oops",&fp->ptregs,mmusr);
...@@ -600,7 +577,7 @@ static inline void bus_error030 (struct frame *fp) ...@@ -600,7 +577,7 @@ static inline void bus_error030 (struct frame *fp)
static volatile long tlong; static volatile long tlong;
#endif #endif
printk("weird %s access at %#lx from pc %#lx (ssw is %#x)\n", pr_err("weird %s access at %#lx from pc %#lx (ssw is %#x)\n",
!(ssw & RW) ? "write" : "read", addr, !(ssw & RW) ? "write" : "read", addr,
fp->ptregs.pc, ssw); fp->ptregs.pc, ssw);
asm volatile ("ptestr #1,%1@,#0\n\t" asm volatile ("ptestr #1,%1@,#0\n\t"
...@@ -609,18 +586,16 @@ static inline void bus_error030 (struct frame *fp) ...@@ -609,18 +586,16 @@ static inline void bus_error030 (struct frame *fp)
: "a" (addr)); : "a" (addr));
mmusr = temp; mmusr = temp;
printk ("level 0 mmusr is %#x\n", mmusr); pr_err("level 0 mmusr is %#x\n", mmusr);
#if 0 #if 0
asm volatile ("pmove %%tt0,%0" asm volatile ("pmove %%tt0,%0"
: "=m" (tlong)); : "=m" (tlong));
printk("tt0 is %#lx, ", tlong); pr_debug("tt0 is %#lx, ", tlong);
asm volatile ("pmove %%tt1,%0" asm volatile ("pmove %%tt1,%0"
: "=m" (tlong)); : "=m" (tlong));
printk("tt1 is %#lx\n", tlong); pr_debug("tt1 is %#lx\n", tlong);
#endif
#ifdef DEBUG
printk("Unknown SIGSEGV - 1\n");
#endif #endif
pr_debug("Unknown SIGSEGV - 1\n");
die_if_kernel("Oops",&fp->ptregs,mmusr); die_if_kernel("Oops",&fp->ptregs,mmusr);
force_sig(SIGSEGV, current); force_sig(SIGSEGV, current);
return; return;
...@@ -641,10 +616,9 @@ static inline void bus_error030 (struct frame *fp) ...@@ -641,10 +616,9 @@ static inline void bus_error030 (struct frame *fp)
return; return;
if (fp->ptregs.sr & PS_S) { if (fp->ptregs.sr & PS_S) {
printk("Instruction fault at %#010lx\n", pr_err("Instruction fault at %#010lx\n", fp->ptregs.pc);
fp->ptregs.pc);
buserr: buserr:
printk ("BAD KERNEL BUSERR\n"); pr_err("BAD KERNEL BUSERR\n");
die_if_kernel("Oops",&fp->ptregs,0); die_if_kernel("Oops",&fp->ptregs,0);
force_sig(SIGKILL, current); force_sig(SIGKILL, current);
return; return;
...@@ -668,28 +642,22 @@ static inline void bus_error030 (struct frame *fp) ...@@ -668,28 +642,22 @@ static inline void bus_error030 (struct frame *fp)
"pmove %%psr,%1" "pmove %%psr,%1"
: "=a&" (desc), "=m" (temp) : "=a&" (desc), "=m" (temp)
: "a" (addr)); : "a" (addr));
pr_debug("mmusr is %#x for addr %#lx in task %p\n",
temp, addr, current);
pr_debug("descriptor address is 0x%p, contents %#lx\n",
__va(desc), *(unsigned long *)__va(desc));
#else #else
asm volatile ("ptestr #1,%1@,#7\n\t" asm volatile ("ptestr #1,%1@,#7\n\t"
"pmove %%psr,%0" "pmove %%psr,%0"
: "=m" (temp) : "a" (addr)); : "=m" (temp) : "a" (addr));
#endif #endif
mmusr = temp; mmusr = temp;
#ifdef DEBUG
printk ("mmusr is %#x for addr %#lx in task %p\n",
mmusr, addr, current);
printk ("descriptor address is %#lx, contents %#lx\n",
__va(desc), *(unsigned long *)__va(desc));
#endif
if (mmusr & MMU_I) if (mmusr & MMU_I)
do_page_fault (&fp->ptregs, addr, 0); do_page_fault (&fp->ptregs, addr, 0);
else if (mmusr & (MMU_B|MMU_L|MMU_S)) { else if (mmusr & (MMU_B|MMU_L|MMU_S)) {
printk ("invalid insn access at %#lx from pc %#lx\n", pr_err("invalid insn access at %#lx from pc %#lx\n",
addr, fp->ptregs.pc); addr, fp->ptregs.pc);
#ifdef DEBUG pr_debug("Unknown SIGSEGV - 2\n");
printk("Unknown SIGSEGV - 2\n");
#endif
die_if_kernel("Oops",&fp->ptregs,mmusr); die_if_kernel("Oops",&fp->ptregs,mmusr);
force_sig(SIGSEGV, current); force_sig(SIGSEGV, current);
return; return;
...@@ -791,9 +759,7 @@ asmlinkage void buserr_c(struct frame *fp) ...@@ -791,9 +759,7 @@ asmlinkage void buserr_c(struct frame *fp)
if (user_mode(&fp->ptregs)) if (user_mode(&fp->ptregs))
current->thread.esp0 = (unsigned long) fp; current->thread.esp0 = (unsigned long) fp;
#ifdef DEBUG pr_debug("*** Bus Error *** Format is %x\n", fp->ptregs.format);
printk ("*** Bus Error *** Format is %x\n", fp->ptregs.format);
#endif
#if defined(CONFIG_COLDFIRE) && defined(CONFIG_MMU) #if defined(CONFIG_COLDFIRE) && defined(CONFIG_MMU)
if (CPU_IS_COLDFIRE) { if (CPU_IS_COLDFIRE) {
...@@ -836,9 +802,7 @@ asmlinkage void buserr_c(struct frame *fp) ...@@ -836,9 +802,7 @@ asmlinkage void buserr_c(struct frame *fp)
#endif #endif
default: default:
die_if_kernel("bad frame format",&fp->ptregs,0); die_if_kernel("bad frame format",&fp->ptregs,0);
#ifdef DEBUG pr_debug("Unknown SIGSEGV - 4\n");
printk("Unknown SIGSEGV - 4\n");
#endif
force_sig(SIGSEGV, current); force_sig(SIGSEGV, current);
} }
} }
...@@ -852,7 +816,7 @@ void show_trace(unsigned long *stack) ...@@ -852,7 +816,7 @@ void show_trace(unsigned long *stack)
unsigned long addr; unsigned long addr;
int i; int i;
printk("Call Trace:"); pr_info("Call Trace:");
addr = (unsigned long)stack + THREAD_SIZE - 1; addr = (unsigned long)stack + THREAD_SIZE - 1;
endstack = (unsigned long *)(addr & -THREAD_SIZE); endstack = (unsigned long *)(addr & -THREAD_SIZE);
i = 0; i = 0;
...@@ -869,13 +833,13 @@ void show_trace(unsigned long *stack) ...@@ -869,13 +833,13 @@ void show_trace(unsigned long *stack)
if (__kernel_text_address(addr)) { if (__kernel_text_address(addr)) {
#ifndef CONFIG_KALLSYMS #ifndef CONFIG_KALLSYMS
if (i % 5 == 0) if (i % 5 == 0)
printk("\n "); pr_cont("\n ");
#endif #endif
printk(" [<%08lx>] %pS\n", addr, (void *)addr); pr_cont(" [<%08lx>] %pS\n", addr, (void *)addr);
i++; i++;
} }
} }
printk("\n"); pr_cont("\n");
} }
void show_registers(struct pt_regs *regs) void show_registers(struct pt_regs *regs)
...@@ -887,81 +851,87 @@ void show_registers(struct pt_regs *regs) ...@@ -887,81 +851,87 @@ void show_registers(struct pt_regs *regs)
int i; int i;
print_modules(); print_modules();
printk("PC: [<%08lx>] %pS\n", regs->pc, (void *)regs->pc); pr_info("PC: [<%08lx>] %pS\n", regs->pc, (void *)regs->pc);
printk("SR: %04x SP: %p a2: %08lx\n", regs->sr, regs, regs->a2); pr_info("SR: %04x SP: %p a2: %08lx\n", regs->sr, regs, regs->a2);
printk("d0: %08lx d1: %08lx d2: %08lx d3: %08lx\n", pr_info("d0: %08lx d1: %08lx d2: %08lx d3: %08lx\n",
regs->d0, regs->d1, regs->d2, regs->d3); regs->d0, regs->d1, regs->d2, regs->d3);
printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n", pr_info("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
regs->d4, regs->d5, regs->a0, regs->a1); regs->d4, regs->d5, regs->a0, regs->a1);
printk("Process %s (pid: %d, task=%p)\n", pr_info("Process %s (pid: %d, task=%p)\n",
current->comm, task_pid_nr(current), current); current->comm, task_pid_nr(current), current);
addr = (unsigned long)&fp->un; addr = (unsigned long)&fp->un;
printk("Frame format=%X ", regs->format); pr_info("Frame format=%X ", regs->format);
switch (regs->format) { switch (regs->format) {
case 0x2: case 0x2:
printk("instr addr=%08lx\n", fp->un.fmt2.iaddr); pr_cont("instr addr=%08lx\n", fp->un.fmt2.iaddr);
addr += sizeof(fp->un.fmt2); addr += sizeof(fp->un.fmt2);
break; break;
case 0x3: case 0x3:
printk("eff addr=%08lx\n", fp->un.fmt3.effaddr); pr_cont("eff addr=%08lx\n", fp->un.fmt3.effaddr);
addr += sizeof(fp->un.fmt3); addr += sizeof(fp->un.fmt3);
break; break;
case 0x4: case 0x4:
printk((CPU_IS_060 ? "fault addr=%08lx fslw=%08lx\n" if (CPU_IS_060)
: "eff addr=%08lx pc=%08lx\n"), pr_cont("fault addr=%08lx fslw=%08lx\n",
fp->un.fmt4.effaddr, fp->un.fmt4.pc); fp->un.fmt4.effaddr, fp->un.fmt4.pc);
else
pr_cont("eff addr=%08lx pc=%08lx\n",
fp->un.fmt4.effaddr, fp->un.fmt4.pc);
addr += sizeof(fp->un.fmt4); addr += sizeof(fp->un.fmt4);
break; break;
case 0x7: case 0x7:
printk("eff addr=%08lx ssw=%04x faddr=%08lx\n", pr_cont("eff addr=%08lx ssw=%04x faddr=%08lx\n",
fp->un.fmt7.effaddr, fp->un.fmt7.ssw, fp->un.fmt7.faddr); fp->un.fmt7.effaddr, fp->un.fmt7.ssw, fp->un.fmt7.faddr);
printk("wb 1 stat/addr/data: %04x %08lx %08lx\n", pr_info("wb 1 stat/addr/data: %04x %08lx %08lx\n",
fp->un.fmt7.wb1s, fp->un.fmt7.wb1a, fp->un.fmt7.wb1dpd0); fp->un.fmt7.wb1s, fp->un.fmt7.wb1a, fp->un.fmt7.wb1dpd0);
printk("wb 2 stat/addr/data: %04x %08lx %08lx\n", pr_info("wb 2 stat/addr/data: %04x %08lx %08lx\n",
fp->un.fmt7.wb2s, fp->un.fmt7.wb2a, fp->un.fmt7.wb2d); fp->un.fmt7.wb2s, fp->un.fmt7.wb2a, fp->un.fmt7.wb2d);
printk("wb 3 stat/addr/data: %04x %08lx %08lx\n", pr_info("wb 3 stat/addr/data: %04x %08lx %08lx\n",
fp->un.fmt7.wb3s, fp->un.fmt7.wb3a, fp->un.fmt7.wb3d); fp->un.fmt7.wb3s, fp->un.fmt7.wb3a, fp->un.fmt7.wb3d);
printk("push data: %08lx %08lx %08lx %08lx\n", pr_info("push data: %08lx %08lx %08lx %08lx\n",
fp->un.fmt7.wb1dpd0, fp->un.fmt7.pd1, fp->un.fmt7.pd2, fp->un.fmt7.wb1dpd0, fp->un.fmt7.pd1, fp->un.fmt7.pd2,
fp->un.fmt7.pd3); fp->un.fmt7.pd3);
addr += sizeof(fp->un.fmt7); addr += sizeof(fp->un.fmt7);
break; break;
case 0x9: case 0x9:
printk("instr addr=%08lx\n", fp->un.fmt9.iaddr); pr_cont("instr addr=%08lx\n", fp->un.fmt9.iaddr);
addr += sizeof(fp->un.fmt9); addr += sizeof(fp->un.fmt9);
break; break;
case 0xa: case 0xa:
printk("ssw=%04x isc=%04x isb=%04x daddr=%08lx dobuf=%08lx\n", pr_cont("ssw=%04x isc=%04x isb=%04x daddr=%08lx dobuf=%08lx\n",
fp->un.fmta.ssw, fp->un.fmta.isc, fp->un.fmta.isb, fp->un.fmta.ssw, fp->un.fmta.isc, fp->un.fmta.isb,
fp->un.fmta.daddr, fp->un.fmta.dobuf); fp->un.fmta.daddr, fp->un.fmta.dobuf);
addr += sizeof(fp->un.fmta); addr += sizeof(fp->un.fmta);
break; break;
case 0xb: case 0xb:
printk("ssw=%04x isc=%04x isb=%04x daddr=%08lx dobuf=%08lx\n", pr_cont("ssw=%04x isc=%04x isb=%04x daddr=%08lx dobuf=%08lx\n",
fp->un.fmtb.ssw, fp->un.fmtb.isc, fp->un.fmtb.isb, fp->un.fmtb.ssw, fp->un.fmtb.isc, fp->un.fmtb.isb,
fp->un.fmtb.daddr, fp->un.fmtb.dobuf); fp->un.fmtb.daddr, fp->un.fmtb.dobuf);
printk("baddr=%08lx dibuf=%08lx ver=%x\n", pr_info("baddr=%08lx dibuf=%08lx ver=%x\n",
fp->un.fmtb.baddr, fp->un.fmtb.dibuf, fp->un.fmtb.ver); fp->un.fmtb.baddr, fp->un.fmtb.dibuf, fp->un.fmtb.ver);
addr += sizeof(fp->un.fmtb); addr += sizeof(fp->un.fmtb);
break; break;
default: default:
printk("\n"); pr_cont("\n");
} }
show_stack(NULL, (unsigned long *)addr); show_stack(NULL, (unsigned long *)addr);
printk("Code:"); pr_info("Code:");
set_fs(KERNEL_DS); set_fs(KERNEL_DS);
cp = (u16 *)regs->pc; cp = (u16 *)regs->pc;
for (i = -8; i < 16; i++) { for (i = -8; i < 16; i++) {
if (get_user(c, cp + i) && i >= 0) { if (get_user(c, cp + i) && i >= 0) {
printk(" Bad PC value."); pr_cont(" Bad PC value.");
break; break;
} }
printk(i ? " %04x" : " <%04x>", c); if (i)
pr_cont(" %04x", c);
else
pr_cont(" <%04x>", c);
} }
set_fs(old_fs); set_fs(old_fs);
printk ("\n"); pr_cont("\n");
} }
void show_stack(struct task_struct *task, unsigned long *stack) void show_stack(struct task_struct *task, unsigned long *stack)
...@@ -978,16 +948,16 @@ void show_stack(struct task_struct *task, unsigned long *stack) ...@@ -978,16 +948,16 @@ void show_stack(struct task_struct *task, unsigned long *stack)
} }
endstack = (unsigned long *)(((unsigned long)stack + THREAD_SIZE - 1) & -THREAD_SIZE); endstack = (unsigned long *)(((unsigned long)stack + THREAD_SIZE - 1) & -THREAD_SIZE);
printk("Stack from %08lx:", (unsigned long)stack); pr_info("Stack from %08lx:", (unsigned long)stack);
p = stack; p = stack;
for (i = 0; i < kstack_depth_to_print; i++) { for (i = 0; i < kstack_depth_to_print; i++) {
if (p + 1 > endstack) if (p + 1 > endstack)
break; break;
if (i % 8 == 0) if (i % 8 == 0)
printk("\n "); pr_cont("\n ");
printk(" %08lx", *p++); pr_cont(" %08lx", *p++);
} }
printk("\n"); pr_cont("\n");
show_trace(stack); show_trace(stack);
} }
...@@ -1005,32 +975,32 @@ void bad_super_trap (struct frame *fp) ...@@ -1005,32 +975,32 @@ void bad_super_trap (struct frame *fp)
console_verbose(); console_verbose();
if (vector < ARRAY_SIZE(vec_names)) if (vector < ARRAY_SIZE(vec_names))
printk ("*** %s *** FORMAT=%X\n", pr_err("*** %s *** FORMAT=%X\n",
vec_names[vector], vec_names[vector],
fp->ptregs.format); fp->ptregs.format);
else else
printk ("*** Exception %d *** FORMAT=%X\n", pr_err("*** Exception %d *** FORMAT=%X\n",
vector, fp->ptregs.format); vector, fp->ptregs.format);
if (vector == VEC_ADDRERR && CPU_IS_020_OR_030) { if (vector == VEC_ADDRERR && CPU_IS_020_OR_030) {
unsigned short ssw = fp->un.fmtb.ssw; unsigned short ssw = fp->un.fmtb.ssw;
printk ("SSW=%#06x ", ssw); pr_err("SSW=%#06x ", ssw);
if (ssw & RC) if (ssw & RC)
printk ("Pipe stage C instruction fault at %#010lx\n", pr_err("Pipe stage C instruction fault at %#010lx\n",
(fp->ptregs.format) == 0xA ? (fp->ptregs.format) == 0xA ?
fp->ptregs.pc + 2 : fp->un.fmtb.baddr - 2); fp->ptregs.pc + 2 : fp->un.fmtb.baddr - 2);
if (ssw & RB) if (ssw & RB)
printk ("Pipe stage B instruction fault at %#010lx\n", pr_err("Pipe stage B instruction fault at %#010lx\n",
(fp->ptregs.format) == 0xA ? (fp->ptregs.format) == 0xA ?
fp->ptregs.pc + 4 : fp->un.fmtb.baddr); fp->ptregs.pc + 4 : fp->un.fmtb.baddr);
if (ssw & DF) if (ssw & DF)
printk ("Data %s fault at %#010lx in %s (pc=%#lx)\n", pr_err("Data %s fault at %#010lx in %s (pc=%#lx)\n",
ssw & RW ? "read" : "write", ssw & RW ? "read" : "write",
fp->un.fmtb.daddr, space_names[ssw & DFC], fp->un.fmtb.daddr, space_names[ssw & DFC],
fp->ptregs.pc); fp->ptregs.pc);
} }
printk ("Current process id is %d\n", task_pid_nr(current)); pr_err("Current process id is %d\n", task_pid_nr(current));
die_if_kernel("BAD KERNEL TRAP", &fp->ptregs, 0); die_if_kernel("BAD KERNEL TRAP", &fp->ptregs, 0);
} }
...@@ -1162,7 +1132,7 @@ void die_if_kernel (char *str, struct pt_regs *fp, int nr) ...@@ -1162,7 +1132,7 @@ void die_if_kernel (char *str, struct pt_regs *fp, int nr)
return; return;
console_verbose(); console_verbose();
printk("%s: %08x\n",str,nr); pr_crit("%s: %08x\n", str, nr);
show_registers(fp); show_registers(fp);
add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE); add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
do_exit(SIGSEGV); do_exit(SIGSEGV);
......
arch/m68k/mac/config.c
View file @ 8cf7a16e
...@@ -26,9 +26,10 @@ ...@@ -26,9 +26,10 @@
#include <linux/adb.h> #include <linux/adb.h>
#include <linux/cuda.h> #include <linux/cuda.h>
#define BOOTINFO_COMPAT_1_0
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/bootinfo-mac.h>
#include <asm/byteorder.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
...@@ -107,45 +108,46 @@ static void __init mac_sched_init(irq_handler_t vector) ...@@ -107,45 +108,46 @@ static void __init mac_sched_init(irq_handler_t vector)
int __init mac_parse_bootinfo(const struct bi_record *record) int __init mac_parse_bootinfo(const struct bi_record *record)
{ {
int unknown = 0; int unknown = 0;
const u_long *data = record->data; const void *data = record->data;
switch (record->tag) { switch (be16_to_cpu(record->tag)) {
case BI_MAC_MODEL: case BI_MAC_MODEL:
mac_bi_data.id = *data; mac_bi_data.id = be32_to_cpup(data);
break; break;
case BI_MAC_VADDR: case BI_MAC_VADDR:
mac_bi_data.videoaddr = *data; mac_bi_data.videoaddr = be32_to_cpup(data);
break; break;
case BI_MAC_VDEPTH: case BI_MAC_VDEPTH:
mac_bi_data.videodepth = *data; mac_bi_data.videodepth = be32_to_cpup(data);
break; break;
case BI_MAC_VROW: case BI_MAC_VROW:
mac_bi_data.videorow = *data; mac_bi_data.videorow = be32_to_cpup(data);
break; break;
case BI_MAC_VDIM: case BI_MAC_VDIM:
mac_bi_data.dimensions = *data; mac_bi_data.dimensions = be32_to_cpup(data);
break; break;
case BI_MAC_VLOGICAL: case BI_MAC_VLOGICAL:
mac_bi_data.videological = VIDEOMEMBASE + (*data & ~VIDEOMEMMASK); mac_orig_videoaddr = be32_to_cpup(data);
mac_orig_videoaddr = *data; mac_bi_data.videological =
VIDEOMEMBASE + (mac_orig_videoaddr & ~VIDEOMEMMASK);
break; break;
case BI_MAC_SCCBASE: case BI_MAC_SCCBASE:
mac_bi_data.sccbase = *data; mac_bi_data.sccbase = be32_to_cpup(data);
break; break;
case BI_MAC_BTIME: case BI_MAC_BTIME:
mac_bi_data.boottime = *data; mac_bi_data.boottime = be32_to_cpup(data);
break; break;
case BI_MAC_GMTBIAS: case BI_MAC_GMTBIAS:
mac_bi_data.gmtbias = *data; mac_bi_data.gmtbias = be32_to_cpup(data);
break; break;
case BI_MAC_MEMSIZE: case BI_MAC_MEMSIZE:
mac_bi_data.memsize = *data; mac_bi_data.memsize = be32_to_cpup(data);
break; break;
case BI_MAC_CPUID: case BI_MAC_CPUID:
mac_bi_data.cpuid = *data; mac_bi_data.cpuid = be32_to_cpup(data);
break; break;
case BI_MAC_ROMBASE: case BI_MAC_ROMBASE:
mac_bi_data.rombase = *data; mac_bi_data.rombase = be32_to_cpup(data);
break; break;
default: default:
unknown = 1; unknown = 1;
......
arch/m68k/mac/iop.c
View file @ 8cf7a16e
...@@ -111,16 +111,15 @@ ...@@ -111,16 +111,15 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/bootinfo.h>
#include <asm/macintosh.h> #include <asm/macintosh.h>
#include <asm/macints.h> #include <asm/macints.h>
#include <asm/mac_iop.h> #include <asm/mac_iop.h>
/*#define DEBUG_IOP*/ /*#define DEBUG_IOP*/
/* Set to non-zero if the IOPs are present. Set by iop_init() */ /* Non-zero if the IOPs are present */
int iop_scc_present,iop_ism_present; int iop_scc_present, iop_ism_present;
/* structure for tracking channel listeners */ /* structure for tracking channel listeners */
......
arch/m68k/mac/misc.c
View file @ 8cf7a16e
...@@ -25,8 +25,6 @@ ...@@ -25,8 +25,6 @@
#include <asm/mac_via.h> #include <asm/mac_via.h>
#include <asm/mac_oss.h> #include <asm/mac_oss.h>
#define BOOTINFO_COMPAT_1_0
#include <asm/bootinfo.h>
#include <asm/machdep.h> #include <asm/machdep.h>
/* Offset between Unix time (1970-based) and Mac time (1904-based) */ /* Offset between Unix time (1970-based) and Mac time (1904-based) */
......
arch/m68k/mac/oss.c
View file @ 8cf7a16e
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <asm/bootinfo.h>
#include <asm/macintosh.h> #include <asm/macintosh.h>
#include <asm/macints.h> #include <asm/macints.h>
#include <asm/mac_via.h> #include <asm/mac_via.h>
......
arch/m68k/mac/psc.c
View file @ 8cf7a16e
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include <linux/irq.h> #include <linux/irq.h>
#include <asm/traps.h> #include <asm/traps.h>
#include <asm/bootinfo.h>
#include <asm/macintosh.h> #include <asm/macintosh.h>
#include <asm/macints.h> #include <asm/macints.h>
#include <asm/mac_psc.h> #include <asm/mac_psc.h>
...@@ -54,7 +53,7 @@ static void psc_debug_dump(void) ...@@ -54,7 +53,7 @@ static void psc_debug_dump(void)
* expanded to cover what I think are the other 7 channels. * expanded to cover what I think are the other 7 channels.
*/ */
static void psc_dma_die_die_die(void) static __init void psc_dma_die_die_die(void)
{ {
int i; int i;
......
arch/m68k/mac/via.c
View file @ 8cf7a16e
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <asm/bootinfo.h>
#include <asm/macintosh.h> #include <asm/macintosh.h>
#include <asm/macints.h> #include <asm/macints.h>
#include <asm/mac_via.h> #include <asm/mac_via.h>
......
arch/m68k/mm/fault.c
View file @ 8cf7a16e
...@@ -25,9 +25,8 @@ int send_fault_sig(struct pt_regs *regs) ...@@ -25,9 +25,8 @@ int send_fault_sig(struct pt_regs *regs)
siginfo.si_signo = current->thread.signo; siginfo.si_signo = current->thread.signo;
siginfo.si_code = current->thread.code; siginfo.si_code = current->thread.code;
siginfo.si_addr = (void *)current->thread.faddr; siginfo.si_addr = (void *)current->thread.faddr;
#ifdef DEBUG pr_debug("send_fault_sig: %p,%d,%d\n", siginfo.si_addr,
printk("send_fault_sig: %p,%d,%d\n", siginfo.si_addr, siginfo.si_signo, siginfo.si_code); siginfo.si_signo, siginfo.si_code);
#endif
if (user_mode(regs)) { if (user_mode(regs)) {
force_sig_info(siginfo.si_signo, force_sig_info(siginfo.si_signo,
...@@ -45,10 +44,10 @@ int send_fault_sig(struct pt_regs *regs) ...@@ -45,10 +44,10 @@ int send_fault_sig(struct pt_regs *regs)
* terminate things with extreme prejudice. * terminate things with extreme prejudice.
*/ */
if ((unsigned long)siginfo.si_addr < PAGE_SIZE) if ((unsigned long)siginfo.si_addr < PAGE_SIZE)
printk(KERN_ALERT "Unable to handle kernel NULL pointer dereference"); pr_alert("Unable to handle kernel NULL pointer dereference");
else else
printk(KERN_ALERT "Unable to handle kernel access"); pr_alert("Unable to handle kernel access");
printk(" at virtual address %p\n", siginfo.si_addr); pr_cont(" at virtual address %p\n", siginfo.si_addr);
die_if_kernel("Oops", regs, 0 /*error_code*/); die_if_kernel("Oops", regs, 0 /*error_code*/);
do_exit(SIGKILL); do_exit(SIGKILL);
} }
...@@ -75,11 +74,8 @@ int do_page_fault(struct pt_regs *regs, unsigned long address, ...@@ -75,11 +74,8 @@ int do_page_fault(struct pt_regs *regs, unsigned long address,
int fault; int fault;
unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE; unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
#ifdef DEBUG pr_debug("do page fault:\nregs->sr=%#x, regs->pc=%#lx, address=%#lx, %ld, %p\n",
printk ("do page fault:\nregs->sr=%#x, regs->pc=%#lx, address=%#lx, %ld, %p\n", regs->sr, regs->pc, address, error_code, mm ? mm->pgd : NULL);
regs->sr, regs->pc, address, error_code,
current->mm->pgd);
#endif
/* /*
* If we're in an interrupt or have no user * If we're in an interrupt or have no user
...@@ -118,9 +114,7 @@ int do_page_fault(struct pt_regs *regs, unsigned long address, ...@@ -118,9 +114,7 @@ int do_page_fault(struct pt_regs *regs, unsigned long address,
* we can handle it.. * we can handle it..
*/ */
good_area: good_area:
#ifdef DEBUG pr_debug("do_page_fault: good_area\n");
printk("do_page_fault: good_area\n");
#endif
switch (error_code & 3) { switch (error_code & 3) {
default: /* 3: write, present */ default: /* 3: write, present */
/* fall through */ /* fall through */
...@@ -143,9 +137,7 @@ int do_page_fault(struct pt_regs *regs, unsigned long address, ...@@ -143,9 +137,7 @@ int do_page_fault(struct pt_regs *regs, unsigned long address,
*/ */
fault = handle_mm_fault(mm, vma, address, flags); fault = handle_mm_fault(mm, vma, address, flags);
#ifdef DEBUG pr_debug("handle_mm_fault returns %d\n", fault);
printk("handle_mm_fault returns %d\n",fault);
#endif
if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current)) if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current))
return 0; return 0;
......
arch/m68k/mm/init.c
View file @ 8cf7a16e
...@@ -59,7 +59,7 @@ EXPORT_SYMBOL(pg_data_table); ...@@ -59,7 +59,7 @@ EXPORT_SYMBOL(pg_data_table);
void __init m68k_setup_node(int node) void __init m68k_setup_node(int node)
{ {
#ifndef CONFIG_SINGLE_MEMORY_CHUNK #ifndef CONFIG_SINGLE_MEMORY_CHUNK
struct mem_info *info = m68k_memory + node; struct m68k_mem_info *info = m68k_memory + node;
int i, end; int i, end;
i = (unsigned long)phys_to_virt(info->addr) >> __virt_to_node_shift(); i = (unsigned long)phys_to_virt(info->addr) >> __virt_to_node_shift();
......
arch/m68k/mm/kmap.c
View file @ 8cf7a16e
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
/* /*
* For 040/060 we can use the virtual memory area like other architectures, * For 040/060 we can use the virtual memory area like other architectures,
* but for 020/030 we want to use early termination page descriptor and we * but for 020/030 we want to use early termination page descriptors and we
* can't mix this with normal page descriptors, so we have to copy that code * can't mix this with normal page descriptors, so we have to copy that code
* (mm/vmalloc.c) and return appriorate aligned addresses. * (mm/vmalloc.c) and return appropriately aligned addresses.
*/ */
#ifdef CPU_M68040_OR_M68060_ONLY #ifdef CPU_M68040_OR_M68060_ONLY
...@@ -224,7 +224,7 @@ void __iomem *__ioremap(unsigned long physaddr, unsigned long size, int cachefla ...@@ -224,7 +224,7 @@ void __iomem *__ioremap(unsigned long physaddr, unsigned long size, int cachefla
EXPORT_SYMBOL(__ioremap); EXPORT_SYMBOL(__ioremap);
/* /*
* Unmap a ioremap()ed region again * Unmap an ioremap()ed region again
*/ */
void iounmap(void __iomem *addr) void iounmap(void __iomem *addr)
{ {
...@@ -241,8 +241,8 @@ EXPORT_SYMBOL(iounmap); ...@@ -241,8 +241,8 @@ EXPORT_SYMBOL(iounmap);
/* /*
* __iounmap unmaps nearly everything, so be careful * __iounmap unmaps nearly everything, so be careful
* it doesn't free currently pointer/page tables anymore but it * Currently it doesn't free pointer/page tables anymore but this
* wans't used anyway and might be added later. * wasn't used anyway and might be added later.
*/ */
void __iounmap(void *addr, unsigned long size) void __iounmap(void *addr, unsigned long size)
{ {
......
arch/m68k/mm/motorola.c
View file @ 8cf7a16e
...@@ -233,7 +233,7 @@ void __init paging_init(void) ...@@ -233,7 +233,7 @@ void __init paging_init(void)
printk("Fix your bootloader or use a memfile to make use of this area!\n"); printk("Fix your bootloader or use a memfile to make use of this area!\n");
m68k_num_memory--; m68k_num_memory--;
memmove(m68k_memory + i, m68k_memory + i + 1, memmove(m68k_memory + i, m68k_memory + i + 1,
(m68k_num_memory - i) * sizeof(struct mem_info)); (m68k_num_memory - i) * sizeof(struct m68k_mem_info));
continue; continue;
} }
addr = m68k_memory[i].addr + m68k_memory[i].size; addr = m68k_memory[i].addr + m68k_memory[i].size;
......
arch/m68k/mvme147/config.c
View file @ 8cf7a16e
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/bootinfo-vme.h>
#include <asm/byteorder.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/irq.h> #include <asm/irq.h>
...@@ -51,9 +53,10 @@ static int bcd2int (unsigned char b); ...@@ -51,9 +53,10 @@ static int bcd2int (unsigned char b);
irq_handler_t tick_handler; irq_handler_t tick_handler;
int mvme147_parse_bootinfo(const struct bi_record *bi) int __init mvme147_parse_bootinfo(const struct bi_record *bi)
{ {
if (bi->tag == BI_VME_TYPE || bi->tag == BI_VME_BRDINFO) uint16_t tag = be16_to_cpu(bi->tag);
if (tag == BI_VME_TYPE || tag == BI_VME_BRDINFO)
return 0; return 0;
else else
return 1; return 1;
......
arch/m68k/mvme16x/config.c
View file @ 8cf7a16e
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
#include <linux/module.h> #include <linux/module.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/bootinfo-vme.h>
#include <asm/byteorder.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/irq.h> #include <asm/irq.h>
...@@ -60,9 +62,10 @@ unsigned short mvme16x_config; ...@@ -60,9 +62,10 @@ unsigned short mvme16x_config;
EXPORT_SYMBOL(mvme16x_config); EXPORT_SYMBOL(mvme16x_config);
int mvme16x_parse_bootinfo(const struct bi_record *bi) int __init mvme16x_parse_bootinfo(const struct bi_record *bi)
{ {
if (bi->tag == BI_VME_TYPE || bi->tag == BI_VME_BRDINFO) uint16_t tag = be16_to_cpu(bi->tag);
if (tag == BI_VME_TYPE || tag == BI_VME_BRDINFO)
return 0; return 0;
else else
return 1; return 1;
...@@ -87,15 +90,15 @@ static void mvme16x_get_model(char *model) ...@@ -87,15 +90,15 @@ static void mvme16x_get_model(char *model)
suf[3] = '\0'; suf[3] = '\0';
suf[0] = suf[1] ? '-' : '\0'; suf[0] = suf[1] ? '-' : '\0';
sprintf(model, "Motorola MVME%x%s", p->brdno, suf); sprintf(model, "Motorola MVME%x%s", be16_to_cpu(p->brdno), suf);
} }
static void mvme16x_get_hardware_list(struct seq_file *m) static void mvme16x_get_hardware_list(struct seq_file *m)
{ {
p_bdid p = &mvme_bdid; uint16_t brdno = be16_to_cpu(mvme_bdid.brdno);
if (p->brdno == 0x0162 || p->brdno == 0x0172) if (brdno == 0x0162 || brdno == 0x0172)
{ {
unsigned char rev = *(unsigned char *)MVME162_VERSION_REG; unsigned char rev = *(unsigned char *)MVME162_VERSION_REG;
...@@ -285,6 +288,7 @@ void __init config_mvme16x(void) ...@@ -285,6 +288,7 @@ void __init config_mvme16x(void)
{ {
p_bdid p = &mvme_bdid; p_bdid p = &mvme_bdid;
char id[40]; char id[40];
uint16_t brdno = be16_to_cpu(p->brdno);
mach_max_dma_address = 0xffffffff; mach_max_dma_address = 0xffffffff;
mach_sched_init = mvme16x_sched_init; mach_sched_init = mvme16x_sched_init;
...@@ -306,18 +310,18 @@ void __init config_mvme16x(void) ...@@ -306,18 +310,18 @@ void __init config_mvme16x(void)
} }
/* Board type is only set by newer versions of vmelilo/tftplilo */ /* Board type is only set by newer versions of vmelilo/tftplilo */
if (vme_brdtype == 0) if (vme_brdtype == 0)
vme_brdtype = p->brdno; vme_brdtype = brdno;
mvme16x_get_model(id); mvme16x_get_model(id);
printk ("\nBRD_ID: %s BUG %x.%x %02x/%02x/%02x\n", id, p->rev>>4, printk ("\nBRD_ID: %s BUG %x.%x %02x/%02x/%02x\n", id, p->rev>>4,
p->rev&0xf, p->yr, p->mth, p->day); p->rev&0xf, p->yr, p->mth, p->day);
if (p->brdno == 0x0162 || p->brdno == 0x172) if (brdno == 0x0162 || brdno == 0x172)
{ {
unsigned char rev = *(unsigned char *)MVME162_VERSION_REG; unsigned char rev = *(unsigned char *)MVME162_VERSION_REG;
mvme16x_config = rev | MVME16x_CONFIG_GOT_SCCA; mvme16x_config = rev | MVME16x_CONFIG_GOT_SCCA;
printk ("MVME%x Hardware status:\n", p->brdno); printk ("MVME%x Hardware status:\n", brdno);
printk (" CPU Type 68%s040\n", printk (" CPU Type 68%s040\n",
rev & MVME16x_CONFIG_GOT_FPU ? "" : "LC"); rev & MVME16x_CONFIG_GOT_FPU ? "" : "LC");
printk (" CPU clock %dMHz\n", printk (" CPU clock %dMHz\n",
...@@ -347,12 +351,12 @@ void __init config_mvme16x(void) ...@@ -347,12 +351,12 @@ void __init config_mvme16x(void)
static irqreturn_t mvme16x_abort_int (int irq, void *dev_id) static irqreturn_t mvme16x_abort_int (int irq, void *dev_id)
{ {
p_bdid p = &mvme_bdid;
unsigned long *new = (unsigned long *)vectors; unsigned long *new = (unsigned long *)vectors;
unsigned long *old = (unsigned long *)0xffe00000; unsigned long *old = (unsigned long *)0xffe00000;
volatile unsigned char uc, *ucp; volatile unsigned char uc, *ucp;
uint16_t brdno = be16_to_cpu(mvme_bdid.brdno);
if (p->brdno == 0x0162 || p->brdno == 0x172) if (brdno == 0x0162 || brdno == 0x172)
{ {
ucp = (volatile unsigned char *)0xfff42043; ucp = (volatile unsigned char *)0xfff42043;
uc = *ucp | 8; uc = *ucp | 8;
...@@ -366,7 +370,7 @@ static irqreturn_t mvme16x_abort_int (int irq, void *dev_id) ...@@ -366,7 +370,7 @@ static irqreturn_t mvme16x_abort_int (int irq, void *dev_id)
*(new+9) = *(old+9); /* Trace */ *(new+9) = *(old+9); /* Trace */
*(new+47) = *(old+47); /* Trap #15 */ *(new+47) = *(old+47); /* Trap #15 */
if (p->brdno == 0x0162 || p->brdno == 0x172) if (brdno == 0x0162 || brdno == 0x172)
*(new+0x5e) = *(old+0x5e); /* ABORT switch */ *(new+0x5e) = *(old+0x5e); /* ABORT switch */
else else
*(new+0x6e) = *(old+0x6e); /* ABORT switch */ *(new+0x6e) = *(old+0x6e); /* ABORT switch */
...@@ -381,7 +385,7 @@ static irqreturn_t mvme16x_timer_int (int irq, void *dev_id) ...@@ -381,7 +385,7 @@ static irqreturn_t mvme16x_timer_int (int irq, void *dev_id)
void mvme16x_sched_init (irq_handler_t timer_routine) void mvme16x_sched_init (irq_handler_t timer_routine)
{ {
p_bdid p = &mvme_bdid; uint16_t brdno = be16_to_cpu(mvme_bdid.brdno);
int irq; int irq;
tick_handler = timer_routine; tick_handler = timer_routine;
...@@ -394,7 +398,7 @@ void mvme16x_sched_init (irq_handler_t timer_routine) ...@@ -394,7 +398,7 @@ void mvme16x_sched_init (irq_handler_t timer_routine)
"timer", mvme16x_timer_int)) "timer", mvme16x_timer_int))
panic ("Couldn't register timer int"); panic ("Couldn't register timer int");
if (p->brdno == 0x0162 || p->brdno == 0x172) if (brdno == 0x0162 || brdno == 0x172)
irq = MVME162_IRQ_ABORT; irq = MVME162_IRQ_ABORT;
else else
irq = MVME167_IRQ_ABORT; irq = MVME167_IRQ_ABORT;
......
arch/m68k/q40/config.c
View file @ 8cf7a16e
...@@ -154,7 +154,7 @@ static unsigned int serports[] = ...@@ -154,7 +154,7 @@ static unsigned int serports[] =
0x3f8,0x2f8,0x3e8,0x2e8,0 0x3f8,0x2f8,0x3e8,0x2e8,0
}; };
static void q40_disable_irqs(void) static void __init q40_disable_irqs(void)
{ {
unsigned i, j; unsigned i, j;
...@@ -198,7 +198,7 @@ void __init config_q40(void) ...@@ -198,7 +198,7 @@ void __init config_q40(void)
} }
int q40_parse_bootinfo(const struct bi_record *rec) int __init q40_parse_bootinfo(const struct bi_record *rec)
{ {
return 1; return 1;
} }
......
arch/m68k/sun3/dvma.c
View file @ 8cf7a16e
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
* *
*/ */
#include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/bootmem.h> #include <linux/bootmem.h>
...@@ -62,10 +63,7 @@ int dvma_map_iommu(unsigned long kaddr, unsigned long baddr, ...@@ -62,10 +63,7 @@ int dvma_map_iommu(unsigned long kaddr, unsigned long baddr,
} }
void sun3_dvma_init(void) void __init sun3_dvma_init(void)
{ {
memset(ptelist, 0, sizeof(ptelist)); memset(ptelist, 0, sizeof(ptelist));
} }
arch/m68k/sun3/mmu_emu.c
View file @ 8cf7a16e
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
** Started 1/16/98 @ 2:22 am ** Started 1/16/98 @ 2:22 am
*/ */
#include <linux/init.h>
#include <linux/mman.h> #include <linux/mman.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/kernel.h> #include <linux/kernel.h>
...@@ -122,7 +123,7 @@ void print_pte_vaddr (unsigned long vaddr) ...@@ -122,7 +123,7 @@ void print_pte_vaddr (unsigned long vaddr)
/* /*
* Initialise the MMU emulator. * Initialise the MMU emulator.
*/ */
void mmu_emu_init(unsigned long bootmem_end) void __init mmu_emu_init(unsigned long bootmem_end)
{ {
unsigned long seg, num; unsigned long seg, num;
int i,j; int i,j;
......
arch/m68k/sun3/sun3dvma.c
View file @ 8cf7a16e
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
* Contains common routines for sun3/sun3x DVMA management. * Contains common routines for sun3/sun3x DVMA management.
*/ */
#include <linux/bootmem.h>
#include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/gfp.h> #include <linux/gfp.h>
...@@ -30,7 +32,7 @@ static inline void dvma_unmap_iommu(unsigned long a, int b) ...@@ -30,7 +32,7 @@ static inline void dvma_unmap_iommu(unsigned long a, int b)
extern void sun3_dvma_init(void); extern void sun3_dvma_init(void);
#endif #endif
static unsigned long iommu_use[IOMMU_TOTAL_ENTRIES]; static unsigned long *iommu_use;
#define dvma_index(baddr) ((baddr - DVMA_START) >> DVMA_PAGE_SHIFT) #define dvma_index(baddr) ((baddr - DVMA_START) >> DVMA_PAGE_SHIFT)
...@@ -245,7 +247,7 @@ static inline int free_baddr(unsigned long baddr) ...@@ -245,7 +247,7 @@ static inline int free_baddr(unsigned long baddr)
} }
void dvma_init(void) void __init dvma_init(void)
{ {
struct hole *hole; struct hole *hole;
...@@ -265,7 +267,7 @@ void dvma_init(void) ...@@ -265,7 +267,7 @@ void dvma_init(void)
list_add(&(hole->list), &hole_list); list_add(&(hole->list), &hole_list);
memset(iommu_use, 0, sizeof(iommu_use)); iommu_use = alloc_bootmem(IOMMU_TOTAL_ENTRIES * sizeof(unsigned long));
dvma_unmap_iommu(DVMA_START, DVMA_SIZE); dvma_unmap_iommu(DVMA_START, DVMA_SIZE);
......
arch/m68k/sun3x/prom.c
View file @ 8cf7a16e
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include <asm/page.h> #include <asm/page.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/bootinfo.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/traps.h> #include <asm/traps.h>
#include <asm/sun3xprom.h> #include <asm/sun3xprom.h>
......
drivers/block/z2ram.c
View file @ 8cf7a16e
...@@ -43,9 +43,6 @@ ...@@ -43,9 +43,6 @@
#include <linux/zorro.h> #include <linux/zorro.h>
extern int m68k_realnum_memory;
extern struct mem_info m68k_memory[NUM_MEMINFO];
#define Z2MINOR_COMBINED (0) #define Z2MINOR_COMBINED (0)
#define Z2MINOR_Z2ONLY (1) #define Z2MINOR_Z2ONLY (1)
#define Z2MINOR_CHIPONLY (2) #define Z2MINOR_CHIPONLY (2)
...@@ -116,8 +113,8 @@ get_z2ram( void ) ...@@ -116,8 +113,8 @@ get_z2ram( void )
if ( test_bit( i, zorro_unused_z2ram ) ) if ( test_bit( i, zorro_unused_z2ram ) )
{ {
z2_count++; z2_count++;
z2ram_map[ z2ram_size++ ] = z2ram_map[z2ram_size++] = (unsigned long)ZTWO_VADDR(Z2RAM_START) +
ZTWO_VADDR( Z2RAM_START ) + ( i << Z2RAM_CHUNKSHIFT ); (i << Z2RAM_CHUNKSHIFT);
clear_bit( i, zorro_unused_z2ram ); clear_bit( i, zorro_unused_z2ram );
} }
} }
......
drivers/ide/buddha.c
View file @ 8cf7a16e
...@@ -198,7 +198,7 @@ static int __init buddha_init(void) ...@@ -198,7 +198,7 @@ static int __init buddha_init(void)
continue; continue;
} }
} }
buddha_board = ZTWO_VADDR(board); buddha_board = (unsigned long)ZTWO_VADDR(board);
/* write to BUDDHA_IRQ_MR to enable the board IRQ */ /* write to BUDDHA_IRQ_MR to enable the board IRQ */
/* X-Surf doesn't have this. IRQs are always on */ /* X-Surf doesn't have this. IRQs are always on */
......
drivers/macintosh/Kconfig
View file @ 8cf7a16e
...@@ -32,7 +32,7 @@ config ADB_MACII ...@@ -32,7 +32,7 @@ config ADB_MACII
config ADB_MACIISI config ADB_MACIISI
bool "Include Mac IIsi ADB driver" bool "Include Mac IIsi ADB driver"
depends on ADB && MAC depends on ADB && MAC && BROKEN
help help
Say Y here if want your kernel to support Macintosh systems that use Say Y here if want your kernel to support Macintosh systems that use
the Mac IIsi style ADB. This includes the IIsi, IIvi, IIvx, Classic the Mac IIsi style ADB. This includes the IIsi, IIvi, IIvx, Classic
......
drivers/net/ethernet/8390/hydra.c
View file @ 8cf7a16e
...@@ -113,7 +113,7 @@ static const struct net_device_ops hydra_netdev_ops = { ...@@ -113,7 +113,7 @@ static const struct net_device_ops hydra_netdev_ops = {
static int hydra_init(struct zorro_dev *z) static int hydra_init(struct zorro_dev *z)
{ {
struct net_device *dev; struct net_device *dev;
unsigned long board = ZTWO_VADDR(z->resource.start); unsigned long board = (unsigned long)ZTWO_VADDR(z->resource.start);
unsigned long ioaddr = board+HYDRA_NIC_BASE; unsigned long ioaddr = board+HYDRA_NIC_BASE;
const char name[] = "NE2000"; const char name[] = "NE2000";
int start_page, stop_page; int start_page, stop_page;
......
drivers/net/ethernet/8390/zorro8390.c
View file @ 8cf7a16e
...@@ -287,7 +287,7 @@ static const struct net_device_ops zorro8390_netdev_ops = { ...@@ -287,7 +287,7 @@ static const struct net_device_ops zorro8390_netdev_ops = {
}; };
static int zorro8390_init(struct net_device *dev, unsigned long board, static int zorro8390_init(struct net_device *dev, unsigned long board,
const char *name, unsigned long ioaddr) const char *name, void __iomem *ioaddr)
{ {
int i; int i;
int err; int err;
...@@ -354,7 +354,7 @@ static int zorro8390_init(struct net_device *dev, unsigned long board, ...@@ -354,7 +354,7 @@ static int zorro8390_init(struct net_device *dev, unsigned long board,
start_page = NESM_START_PG; start_page = NESM_START_PG;
stop_page = NESM_STOP_PG; stop_page = NESM_STOP_PG;
dev->base_addr = ioaddr; dev->base_addr = (unsigned long)ioaddr;
dev->irq = IRQ_AMIGA_PORTS; dev->irq = IRQ_AMIGA_PORTS;
/* Install the Interrupt handler */ /* Install the Interrupt handler */
......
drivers/net/ethernet/amd/a2065.c
View file @ 8cf7a16e
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
#include <linux/zorro.h> #include <linux/zorro.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <asm/byteorder.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/amigaints.h> #include <asm/amigaints.h>
#include <asm/amigahw.h> #include <asm/amigahw.h>
...@@ -678,6 +679,7 @@ static int a2065_init_one(struct zorro_dev *z, ...@@ -678,6 +679,7 @@ static int a2065_init_one(struct zorro_dev *z,
unsigned long base_addr = board + A2065_LANCE; unsigned long base_addr = board + A2065_LANCE;
unsigned long mem_start = board + A2065_RAM; unsigned long mem_start = board + A2065_RAM;
struct resource *r1, *r2; struct resource *r1, *r2;
u32 serial;
int err; int err;
r1 = request_mem_region(base_addr, sizeof(struct lance_regs), r1 = request_mem_region(base_addr, sizeof(struct lance_regs),
...@@ -702,6 +704,7 @@ static int a2065_init_one(struct zorro_dev *z, ...@@ -702,6 +704,7 @@ static int a2065_init_one(struct zorro_dev *z,
r1->name = dev->name; r1->name = dev->name;
r2->name = dev->name; r2->name = dev->name;
serial = be32_to_cpu(z->rom.er_SerialNumber);
dev->dev_addr[0] = 0x00; dev->dev_addr[0] = 0x00;
if (z->id != ZORRO_PROD_AMERISTAR_A2065) { /* Commodore */ if (z->id != ZORRO_PROD_AMERISTAR_A2065) { /* Commodore */
dev->dev_addr[1] = 0x80; dev->dev_addr[1] = 0x80;
...@@ -710,11 +713,11 @@ static int a2065_init_one(struct zorro_dev *z, ...@@ -710,11 +713,11 @@ static int a2065_init_one(struct zorro_dev *z,
dev->dev_addr[1] = 0x00; dev->dev_addr[1] = 0x00;
dev->dev_addr[2] = 0x9f; dev->dev_addr[2] = 0x9f;
} }
dev->dev_addr[3] = (z->rom.er_SerialNumber >> 16) & 0xff; dev->dev_addr[3] = (serial >> 16) & 0xff;
dev->dev_addr[4] = (z->rom.er_SerialNumber >> 8) & 0xff; dev->dev_addr[4] = (serial >> 8) & 0xff;
dev->dev_addr[5] = z->rom.er_SerialNumber & 0xff; dev->dev_addr[5] = serial & 0xff;
dev->base_addr = ZTWO_VADDR(base_addr); dev->base_addr = (unsigned long)ZTWO_VADDR(base_addr);
dev->mem_start = ZTWO_VADDR(mem_start); dev->mem_start = (unsigned long)ZTWO_VADDR(mem_start);
dev->mem_end = dev->mem_start + A2065_RAM_SIZE; dev->mem_end = dev->mem_start + A2065_RAM_SIZE;
priv->ll = (volatile struct lance_regs *)dev->base_addr; priv->ll = (volatile struct lance_regs *)dev->base_addr;
......
drivers/net/ethernet/amd/ariadne.c
View file @ 8cf7a16e
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
#include <linux/zorro.h> #include <linux/zorro.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <asm/byteorder.h>
#include <asm/amigaints.h> #include <asm/amigaints.h>
#include <asm/amigahw.h> #include <asm/amigahw.h>
#include <asm/irq.h> #include <asm/irq.h>
...@@ -718,6 +719,7 @@ static int ariadne_init_one(struct zorro_dev *z, ...@@ -718,6 +719,7 @@ static int ariadne_init_one(struct zorro_dev *z,
struct resource *r1, *r2; struct resource *r1, *r2;
struct net_device *dev; struct net_device *dev;
struct ariadne_private *priv; struct ariadne_private *priv;
u32 serial;
int err; int err;
r1 = request_mem_region(base_addr, sizeof(struct Am79C960), "Am79C960"); r1 = request_mem_region(base_addr, sizeof(struct Am79C960), "Am79C960");
...@@ -741,14 +743,15 @@ static int ariadne_init_one(struct zorro_dev *z, ...@@ -741,14 +743,15 @@ static int ariadne_init_one(struct zorro_dev *z,
r1->name = dev->name; r1->name = dev->name;
r2->name = dev->name; r2->name = dev->name;
serial = be32_to_cpu(z->rom.er_SerialNumber);
dev->dev_addr[0] = 0x00; dev->dev_addr[0] = 0x00;
dev->dev_addr[1] = 0x60; dev->dev_addr[1] = 0x60;
dev->dev_addr[2] = 0x30; dev->dev_addr[2] = 0x30;
dev->dev_addr[3] = (z->rom.er_SerialNumber >> 16) & 0xff; dev->dev_addr[3] = (serial >> 16) & 0xff;
dev->dev_addr[4] = (z->rom.er_SerialNumber >> 8) & 0xff; dev->dev_addr[4] = (serial >> 8) & 0xff;
dev->dev_addr[5] = z->rom.er_SerialNumber & 0xff; dev->dev_addr[5] = serial & 0xff;
dev->base_addr = ZTWO_VADDR(base_addr); dev->base_addr = (unsigned long)ZTWO_VADDR(base_addr);
dev->mem_start = ZTWO_VADDR(mem_start); dev->mem_start = (unsigned long)ZTWO_VADDR(mem_start);
dev->mem_end = dev->mem_start + ARIADNE_RAM_SIZE; dev->mem_end = dev->mem_start + ARIADNE_RAM_SIZE;
dev->netdev_ops = &ariadne_netdev_ops; dev->netdev_ops = &ariadne_netdev_ops;
......
drivers/net/ethernet/natsemi/macsonic.c
View file @ 8cf7a16e
...@@ -52,7 +52,6 @@ ...@@ -52,7 +52,6 @@
#include <linux/bitrev.h> #include <linux/bitrev.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/bootinfo.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/hwtest.h> #include <asm/hwtest.h>
......
drivers/parport/parport_mfc3.c
View file @ 8cf7a16e
...@@ -300,7 +300,7 @@ static int __init parport_mfc3_init(void) ...@@ -300,7 +300,7 @@ static int __init parport_mfc3_init(void)
if (!request_mem_region(piabase, sizeof(struct pia), "PIA")) if (!request_mem_region(piabase, sizeof(struct pia), "PIA"))
continue; continue;
pp = (struct pia *)ZTWO_VADDR(piabase); pp = ZTWO_VADDR(piabase);
pp->crb = 0; pp->crb = 0;
pp->pddrb = 255; /* all data pins output */ pp->pddrb = 255; /* all data pins output */
pp->crb = PIA_DDR|32|8; pp->crb = PIA_DDR|32|8;
......
drivers/scsi/a2091.c
View file @ 8cf7a16e
...@@ -201,7 +201,7 @@ static int a2091_probe(struct zorro_dev *z, const struct zorro_device_id *ent) ...@@ -201,7 +201,7 @@ static int a2091_probe(struct zorro_dev *z, const struct zorro_device_id *ent)
instance->irq = IRQ_AMIGA_PORTS; instance->irq = IRQ_AMIGA_PORTS;
instance->unique_id = z->slotaddr; instance->unique_id = z->slotaddr;
regs = (struct a2091_scsiregs *)ZTWO_VADDR(z->resource.start); regs = ZTWO_VADDR(z->resource.start);
regs->DAWR = DAWR_A2091; regs->DAWR = DAWR_A2091;
wdregs.SASR = &regs->SASR; wdregs.SASR = &regs->SASR;
......
drivers/scsi/a3000.c
View file @ 8cf7a16e
...@@ -220,7 +220,7 @@ static int __init amiga_a3000_scsi_probe(struct platform_device *pdev) ...@@ -220,7 +220,7 @@ static int __init amiga_a3000_scsi_probe(struct platform_device *pdev)
instance->irq = IRQ_AMIGA_PORTS; instance->irq = IRQ_AMIGA_PORTS;
regs = (struct a3000_scsiregs *)ZTWO_VADDR(res->start); regs = ZTWO_VADDR(res->start);
regs->DAWR = DAWR_A3000; regs->DAWR = DAWR_A3000;
wdregs.SASR = &regs->SASR; wdregs.SASR = &regs->SASR;
......
drivers/scsi/a4000t.c
View file @ 8cf7a16e
...@@ -56,7 +56,7 @@ static int __init amiga_a4000t_scsi_probe(struct platform_device *pdev) ...@@ -56,7 +56,7 @@ static int __init amiga_a4000t_scsi_probe(struct platform_device *pdev)
scsi_addr = res->start + A4000T_SCSI_OFFSET; scsi_addr = res->start + A4000T_SCSI_OFFSET;
/* Fill in the required pieces of hostdata */ /* Fill in the required pieces of hostdata */
hostdata->base = (void __iomem *)ZTWO_VADDR(scsi_addr); hostdata->base = ZTWO_VADDR(scsi_addr);
hostdata->clock = 50; hostdata->clock = 50;
hostdata->chip710 = 1; hostdata->chip710 = 1;
hostdata->dmode_extra = DMODE_FC2; hostdata->dmode_extra = DMODE_FC2;
......
drivers/scsi/gvp11.c
View file @ 8cf7a16e
...@@ -310,7 +310,7 @@ static int gvp11_probe(struct zorro_dev *z, const struct zorro_device_id *ent) ...@@ -310,7 +310,7 @@ static int gvp11_probe(struct zorro_dev *z, const struct zorro_device_id *ent)
if (!request_mem_region(address, 256, "wd33c93")) if (!request_mem_region(address, 256, "wd33c93"))
return -EBUSY; return -EBUSY;
regs = (struct gvp11_scsiregs *)(ZTWO_VADDR(address)); regs = ZTWO_VADDR(address);
error = check_wd33c93(regs); error = check_wd33c93(regs);
if (error) if (error)
......
drivers/scsi/zorro7xx.c
View file @ 8cf7a16e
...@@ -104,7 +104,7 @@ static int zorro7xx_init_one(struct zorro_dev *z, ...@@ -104,7 +104,7 @@ static int zorro7xx_init_one(struct zorro_dev *z,
if (ioaddr > 0x01000000) if (ioaddr > 0x01000000)
hostdata->base = ioremap(ioaddr, zorro_resource_len(z)); hostdata->base = ioremap(ioaddr, zorro_resource_len(z));
else else
hostdata->base = (void __iomem *)ZTWO_VADDR(ioaddr); hostdata->base = ZTWO_VADDR(ioaddr);
hostdata->clock = 50; hostdata->clock = 50;
hostdata->chip710 = 1; hostdata->chip710 = 1;
......
drivers/video/amifb.c
View file @ 8cf7a16e
...@@ -3710,7 +3710,7 @@ static int __init amifb_probe(struct platform_device *pdev) ...@@ -3710,7 +3710,7 @@ static int __init amifb_probe(struct platform_device *pdev)
if (!videomemory) { if (!videomemory) {
dev_warn(&pdev->dev, dev_warn(&pdev->dev,
"Unable to map videomem cached writethrough\n"); "Unable to map videomem cached writethrough\n");
info->screen_base = (char *)ZTWO_VADDR(info->fix.smem_start); info->screen_base = ZTWO_VADDR(info->fix.smem_start);
} else } else
info->screen_base = (char *)videomemory; info->screen_base = (char *)videomemory;
......
drivers/video/cirrusfb.c
View file @ 8cf7a16e
...@@ -2256,7 +2256,7 @@ static int cirrusfb_zorro_register(struct zorro_dev *z, ...@@ -2256,7 +2256,7 @@ static int cirrusfb_zorro_register(struct zorro_dev *z,
info->fix.mmio_start = regbase; info->fix.mmio_start = regbase;
cinfo->regbase = regbase > 16 * MB_ ? ioremap(regbase, 64 * 1024) cinfo->regbase = regbase > 16 * MB_ ? ioremap(regbase, 64 * 1024)
: (caddr_t)ZTWO_VADDR(regbase); : ZTWO_VADDR(regbase);
if (!cinfo->regbase) { if (!cinfo->regbase) {
dev_err(info->device, "Cannot map registers\n"); dev_err(info->device, "Cannot map registers\n");
error = -EIO; error = -EIO;
...@@ -2266,7 +2266,7 @@ static int cirrusfb_zorro_register(struct zorro_dev *z, ...@@ -2266,7 +2266,7 @@ static int cirrusfb_zorro_register(struct zorro_dev *z,
info->fix.smem_start = rambase; info->fix.smem_start = rambase;
info->screen_size = ramsize; info->screen_size = ramsize;
info->screen_base = rambase > 16 * MB_ ? ioremap(rambase, ramsize) info->screen_base = rambase > 16 * MB_ ? ioremap(rambase, ramsize)
: (caddr_t)ZTWO_VADDR(rambase); : ZTWO_VADDR(rambase);
if (!info->screen_base) { if (!info->screen_base) {
dev_err(info->device, "Cannot map video RAM\n"); dev_err(info->device, "Cannot map video RAM\n");
error = -EIO; error = -EIO;
......
drivers/video/macfb.c
View file @ 8cf7a16e
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#include <linux/fb.h> #include <linux/fb.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/bootinfo.h>
#include <asm/macintosh.h> #include <asm/macintosh.h>
#include <asm/io.h> #include <asm/io.h>
......
drivers/video/valkyriefb.c
View file @ 8cf7a16e
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
#include <linux/cuda.h> #include <linux/cuda.h>
#include <asm/io.h> #include <asm/io.h>
#ifdef CONFIG_MAC #ifdef CONFIG_MAC
#include <asm/bootinfo.h>
#include <asm/macintosh.h> #include <asm/macintosh.h>
#else #else
#include <asm/prom.h> #include <asm/prom.h>
......
drivers/zorro/Makefile
View file @ 8cf7a16e
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
# Makefile for the Zorro bus specific drivers. # Makefile for the Zorro bus specific drivers.
# #
obj-$(CONFIG_ZORRO) += zorro.o zorro-driver.o zorro-sysfs.o names.o obj-$(CONFIG_ZORRO) += zorro.o zorro-driver.o zorro-sysfs.o
obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_PROC_FS) += proc.o
obj-$(CONFIG_ZORRO_NAMES) += names.o
hostprogs-y := gen-devlist hostprogs-y := gen-devlist
......
drivers/zorro/names.c
View file @ 8cf7a16e
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
#include <linux/zorro.h> #include <linux/zorro.h>
#ifdef CONFIG_ZORRO_NAMES
struct zorro_prod_info { struct zorro_prod_info {
__u16 prod; __u16 prod;
unsigned short seen; unsigned short seen;
...@@ -69,7 +67,6 @@ void __init zorro_name_device(struct zorro_dev *dev) ...@@ -69,7 +67,6 @@ void __init zorro_name_device(struct zorro_dev *dev)
} while (--i); } while (--i);
/* Couldn't find either the manufacturer nor the product */ /* Couldn't find either the manufacturer nor the product */
sprintf(name, "Zorro device %08x", dev->id);
return; return;
match_manuf: { match_manuf: {
...@@ -98,11 +95,3 @@ void __init zorro_name_device(struct zorro_dev *dev) ...@@ -98,11 +95,3 @@ void __init zorro_name_device(struct zorro_dev *dev)
} }
} }
} }
#else
void __init zorro_name_device(struct zorro_dev *dev)
{
}
#endif
drivers/zorro/proc.c
View file @ 8cf7a16e
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/export.h> #include <linux/export.h>
#include <asm/byteorder.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/amigahw.h> #include <asm/amigahw.h>
#include <asm/setup.h> #include <asm/setup.h>
...@@ -41,10 +43,10 @@ proc_bus_zorro_read(struct file *file, char __user *buf, size_t nbytes, loff_t * ...@@ -41,10 +43,10 @@ proc_bus_zorro_read(struct file *file, char __user *buf, size_t nbytes, loff_t *
/* Construct a ConfigDev */ /* Construct a ConfigDev */
memset(&cd, 0, sizeof(cd)); memset(&cd, 0, sizeof(cd));
cd.cd_Rom = z->rom; cd.cd_Rom = z->rom;
cd.cd_SlotAddr = z->slotaddr; cd.cd_SlotAddr = cpu_to_be16(z->slotaddr);
cd.cd_SlotSize = z->slotsize; cd.cd_SlotSize = cpu_to_be16(z->slotsize);
cd.cd_BoardAddr = (void *)zorro_resource_start(z); cd.cd_BoardAddr = cpu_to_be32(zorro_resource_start(z));
cd.cd_BoardSize = zorro_resource_len(z); cd.cd_BoardSize = cpu_to_be32(zorro_resource_len(z));
if (copy_to_user(buf, (void *)&cd + pos, nbytes)) if (copy_to_user(buf, (void *)&cd + pos, nbytes))
return -EFAULT; return -EFAULT;
......
drivers/zorro/zorro-driver.c
View file @ 8cf7a16e
...@@ -161,11 +161,12 @@ static int zorro_uevent(struct device *dev, struct kobj_uevent_env *env) ...@@ -161,11 +161,12 @@ static int zorro_uevent(struct device *dev, struct kobj_uevent_env *env)
} }
struct bus_type zorro_bus_type = { struct bus_type zorro_bus_type = {
.name = "zorro", .name = "zorro",
.match = zorro_bus_match, .dev_name = "zorro",
.uevent = zorro_uevent, .match = zorro_bus_match,
.probe = zorro_device_probe, .uevent = zorro_uevent,
.remove = zorro_device_remove, .probe = zorro_device_probe,
.remove = zorro_device_remove,
}; };
EXPORT_SYMBOL(zorro_bus_type); EXPORT_SYMBOL(zorro_bus_type);
......
drivers/zorro/zorro-sysfs.c
View file @ 8cf7a16e
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
#include <linux/stat.h> #include <linux/stat.h>
#include <linux/string.h> #include <linux/string.h>
#include <asm/byteorder.h>
#include "zorro.h" #include "zorro.h"
...@@ -33,10 +35,20 @@ static DEVICE_ATTR(name, S_IRUGO, show_##name, NULL); ...@@ -33,10 +35,20 @@ static DEVICE_ATTR(name, S_IRUGO, show_##name, NULL);
zorro_config_attr(id, id, "0x%08x\n"); zorro_config_attr(id, id, "0x%08x\n");
zorro_config_attr(type, rom.er_Type, "0x%02x\n"); zorro_config_attr(type, rom.er_Type, "0x%02x\n");
zorro_config_attr(serial, rom.er_SerialNumber, "0x%08x\n");
zorro_config_attr(slotaddr, slotaddr, "0x%04x\n"); zorro_config_attr(slotaddr, slotaddr, "0x%04x\n");
zorro_config_attr(slotsize, slotsize, "0x%04x\n"); zorro_config_attr(slotsize, slotsize, "0x%04x\n");
static ssize_t
show_serial(struct device *dev, struct device_attribute *attr, char *buf)
{
struct zorro_dev *z;
z = to_zorro_dev(dev);
return sprintf(buf, "0x%08x\n", be32_to_cpu(z->rom.er_SerialNumber));
}
static DEVICE_ATTR(serial, S_IRUGO, show_serial, NULL);
static ssize_t zorro_show_resource(struct device *dev, struct device_attribute *attr, char *buf) static ssize_t zorro_show_resource(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct zorro_dev *z = to_zorro_dev(dev); struct zorro_dev *z = to_zorro_dev(dev);
...@@ -60,10 +72,10 @@ static ssize_t zorro_read_config(struct file *filp, struct kobject *kobj, ...@@ -60,10 +72,10 @@ static ssize_t zorro_read_config(struct file *filp, struct kobject *kobj,
/* Construct a ConfigDev */ /* Construct a ConfigDev */
memset(&cd, 0, sizeof(cd)); memset(&cd, 0, sizeof(cd));
cd.cd_Rom = z->rom; cd.cd_Rom = z->rom;
cd.cd_SlotAddr = z->slotaddr; cd.cd_SlotAddr = cpu_to_be16(z->slotaddr);
cd.cd_SlotSize = z->slotsize; cd.cd_SlotSize = cpu_to_be16(z->slotsize);
cd.cd_BoardAddr = (void *)zorro_resource_start(z); cd.cd_BoardAddr = cpu_to_be32(zorro_resource_start(z));
cd.cd_BoardSize = zorro_resource_len(z); cd.cd_BoardSize = cpu_to_be32(zorro_resource_len(z));
return memory_read_from_buffer(buf, count, &off, &cd, sizeof(cd)); return memory_read_from_buffer(buf, count, &off, &cd, sizeof(cd));
} }
......
drivers/zorro/zorro.c
View file @ 8cf7a16e
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/byteorder.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/amigahw.h> #include <asm/amigahw.h>
...@@ -29,7 +30,8 @@ ...@@ -29,7 +30,8 @@
*/ */
unsigned int zorro_num_autocon; unsigned int zorro_num_autocon;
struct zorro_dev zorro_autocon[ZORRO_NUM_AUTO]; struct zorro_dev_init zorro_autocon_init[ZORRO_NUM_AUTO] __initdata;
struct zorro_dev *zorro_autocon;
/* /*
...@@ -38,6 +40,7 @@ struct zorro_dev zorro_autocon[ZORRO_NUM_AUTO]; ...@@ -38,6 +40,7 @@ struct zorro_dev zorro_autocon[ZORRO_NUM_AUTO];
struct zorro_bus { struct zorro_bus {
struct device dev; struct device dev;
struct zorro_dev devices[0];
}; };
...@@ -125,18 +128,22 @@ static struct resource __init *zorro_find_parent_resource( ...@@ -125,18 +128,22 @@ static struct resource __init *zorro_find_parent_resource(
static int __init amiga_zorro_probe(struct platform_device *pdev) static int __init amiga_zorro_probe(struct platform_device *pdev)
{ {
struct zorro_bus *bus; struct zorro_bus *bus;
struct zorro_dev_init *zi;
struct zorro_dev *z; struct zorro_dev *z;
struct resource *r; struct resource *r;
unsigned int i; unsigned int i;
int error; int error;
/* Initialize the Zorro bus */ /* Initialize the Zorro bus */
bus = kzalloc(sizeof(*bus), GFP_KERNEL); bus = kzalloc(sizeof(*bus) +
zorro_num_autocon * sizeof(bus->devices[0]),
GFP_KERNEL);
if (!bus) if (!bus)
return -ENOMEM; return -ENOMEM;
zorro_autocon = bus->devices;
bus->dev.parent = &pdev->dev; bus->dev.parent = &pdev->dev;
dev_set_name(&bus->dev, "zorro"); dev_set_name(&bus->dev, zorro_bus_type.name);
error = device_register(&bus->dev); error = device_register(&bus->dev);
if (error) { if (error) {
pr_err("Zorro: Error registering zorro_bus\n"); pr_err("Zorro: Error registering zorro_bus\n");
...@@ -151,15 +158,23 @@ static int __init amiga_zorro_probe(struct platform_device *pdev) ...@@ -151,15 +158,23 @@ static int __init amiga_zorro_probe(struct platform_device *pdev)
/* First identify all devices ... */ /* First identify all devices ... */
for (i = 0; i < zorro_num_autocon; i++) { for (i = 0; i < zorro_num_autocon; i++) {
zi = &zorro_autocon_init[i];
z = &zorro_autocon[i]; z = &zorro_autocon[i];
z->id = (z->rom.er_Manufacturer<<16) | (z->rom.er_Product<<8);
z->rom = zi->rom;
z->id = (be16_to_cpu(z->rom.er_Manufacturer) << 16) |
(z->rom.er_Product << 8);
if (z->id == ZORRO_PROD_GVP_EPC_BASE) { if (z->id == ZORRO_PROD_GVP_EPC_BASE) {
/* GVP quirk */ /* GVP quirk */
unsigned long magic = zorro_resource_start(z)+0x8000; unsigned long magic = zi->boardaddr + 0x8000;
z->id |= *(u16 *)ZTWO_VADDR(magic) & GVP_PRODMASK; z->id |= *(u16 *)ZTWO_VADDR(magic) & GVP_PRODMASK;
} }
z->slotaddr = zi->slotaddr;
z->slotsize = zi->slotsize;
sprintf(z->name, "Zorro device %08x", z->id); sprintf(z->name, "Zorro device %08x", z->id);
zorro_name_device(z); zorro_name_device(z);
z->resource.start = zi->boardaddr;
z->resource.end = zi->boardaddr + zi->boardsize - 1;
z->resource.name = z->name; z->resource.name = z->name;
r = zorro_find_parent_resource(pdev, z); r = zorro_find_parent_resource(pdev, z);
error = request_resource(r, &z->resource); error = request_resource(r, &z->resource);
...@@ -167,9 +182,9 @@ static int __init amiga_zorro_probe(struct platform_device *pdev) ...@@ -167,9 +182,9 @@ static int __init amiga_zorro_probe(struct platform_device *pdev)
dev_err(&bus->dev, dev_err(&bus->dev,
"Address space collision on device %s %pR\n", "Address space collision on device %s %pR\n",
z->name, &z->resource); z->name, &z->resource);
dev_set_name(&z->dev, "%02x", i);
z->dev.parent = &bus->dev; z->dev.parent = &bus->dev;
z->dev.bus = &zorro_bus_type; z->dev.bus = &zorro_bus_type;
z->dev.id = i;
} }
/* ... then register them */ /* ... then register them */
......
drivers/zorro/zorro.h
View file @ 8cf7a16e
#ifdef CONFIG_ZORRO_NAMES
extern void zorro_name_device(struct zorro_dev *z); extern void zorro_name_device(struct zorro_dev *z);
#else
static inline void zorro_name_device(struct zorro_dev *dev) { }
#endif
extern int zorro_create_sysfs_dev_files(struct zorro_dev *z); extern int zorro_create_sysfs_dev_files(struct zorro_dev *z);
include/linux/zorro.h
View file @ 8cf7a16e
...@@ -11,107 +11,10 @@ ...@@ -11,107 +11,10 @@
#ifndef _LINUX_ZORRO_H #ifndef _LINUX_ZORRO_H
#define _LINUX_ZORRO_H #define _LINUX_ZORRO_H
#include <linux/device.h>
/*
* Each Zorro board has a 32-bit ID of the form
*
* mmmmmmmmmmmmmmmmppppppppeeeeeeee
*
* with
*
* mmmmmmmmmmmmmmmm 16-bit Manufacturer ID (assigned by CBM (sigh))
* pppppppp 8-bit Product ID (assigned by manufacturer)
* eeeeeeee 8-bit Extended Product ID (currently only used
* for some GVP boards)
*/
#define ZORRO_MANUF(id) ((id) >> 16)
#define ZORRO_PROD(id) (((id) >> 8) & 0xff)
#define ZORRO_EPC(id) ((id) & 0xff)
#define ZORRO_ID(manuf, prod, epc) \
((ZORRO_MANUF_##manuf << 16) | ((prod) << 8) | (epc))
typedef __u32 zorro_id;
/* Include the ID list */
#include <linux/zorro_ids.h>
/* #include <uapi/linux/zorro.h>
* GVP identifies most of its products through the 'extended product code'
* (epc). The epc has to be ANDed with the GVP_PRODMASK before the
* identification.
*/
#define GVP_PRODMASK (0xf8)
#define GVP_SCSICLKMASK (0x01)
enum GVP_flags {
GVP_IO = 0x01,
GVP_ACCEL = 0x02,
GVP_SCSI = 0x04,
GVP_24BITDMA = 0x08,
GVP_25BITDMA = 0x10,
GVP_NOBANK = 0x20,
GVP_14MHZ = 0x40,
};
struct Node {
struct Node *ln_Succ; /* Pointer to next (successor) */
struct Node *ln_Pred; /* Pointer to previous (predecessor) */
__u8 ln_Type;
__s8 ln_Pri; /* Priority, for sorting */
__s8 *ln_Name; /* ID string, null terminated */
} __attribute__ ((packed));
struct ExpansionRom {
/* -First 16 bytes of the expansion ROM */
__u8 er_Type; /* Board type, size and flags */
__u8 er_Product; /* Product number, assigned by manufacturer */
__u8 er_Flags; /* Flags */
__u8 er_Reserved03; /* Must be zero ($ff inverted) */
__u16 er_Manufacturer; /* Unique ID, ASSIGNED BY COMMODORE-AMIGA! */
__u32 er_SerialNumber; /* Available for use by manufacturer */
__u16 er_InitDiagVec; /* Offset to optional "DiagArea" structure */
__u8 er_Reserved0c;
__u8 er_Reserved0d;
__u8 er_Reserved0e;
__u8 er_Reserved0f;
} __attribute__ ((packed));
/* er_Type board type bits */
#define ERT_TYPEMASK 0xc0
#define ERT_ZORROII 0xc0
#define ERT_ZORROIII 0x80
/* other bits defined in er_Type */
#define ERTB_MEMLIST 5 /* Link RAM into free memory list */
#define ERTF_MEMLIST (1<<5)
struct ConfigDev {
struct Node cd_Node;
__u8 cd_Flags; /* (read/write) */
__u8 cd_Pad; /* reserved */
struct ExpansionRom cd_Rom; /* copy of board's expansion ROM */
void *cd_BoardAddr; /* where in memory the board was placed */
__u32 cd_BoardSize; /* size of board in bytes */
__u16 cd_SlotAddr; /* which slot number (PRIVATE) */
__u16 cd_SlotSize; /* number of slots (PRIVATE) */
void *cd_Driver; /* pointer to node of driver */
struct ConfigDev *cd_NextCD; /* linked list of drivers to config */
__u32 cd_Unused[4]; /* for whatever the driver wants */
} __attribute__ ((packed));
#define ZORRO_NUM_AUTO 16
#ifdef __KERNEL__
#include <linux/device.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/mod_devicetable.h> #include <linux/mod_devicetable.h>
...@@ -175,7 +78,23 @@ static inline struct zorro_driver *zorro_dev_driver(const struct zorro_dev *z) ...@@ -175,7 +78,23 @@ static inline struct zorro_driver *zorro_dev_driver(const struct zorro_dev *z)
extern unsigned int zorro_num_autocon; /* # of autoconfig devices found */ extern unsigned int zorro_num_autocon; /* # of autoconfig devices found */
extern struct zorro_dev zorro_autocon[ZORRO_NUM_AUTO]; extern struct zorro_dev *zorro_autocon;
/*
* Minimal information about a Zorro device, passed from bootinfo
* Only available temporarily, i.e. until initmem has been freed!
*/
struct zorro_dev_init {
struct ExpansionRom rom;
u16 slotaddr;
u16 slotsize;
u32 boardaddr;
u32 boardsize;
};
extern struct zorro_dev_init zorro_autocon_init[ZORRO_NUM_AUTO] __initdata;
/* /*
...@@ -229,6 +148,4 @@ extern DECLARE_BITMAP(zorro_unused_z2ram, 128); ...@@ -229,6 +148,4 @@ extern DECLARE_BITMAP(zorro_unused_z2ram, 128);
#define Z2RAM_CHUNKSHIFT (16) #define Z2RAM_CHUNKSHIFT (16)
#endif /* __KERNEL__ */
#endif /* _LINUX_ZORRO_H */ #endif /* _LINUX_ZORRO_H */
include/uapi/linux/Kbuild
View file @ 8cf7a16e
...@@ -426,3 +426,5 @@ header-y += x25.h ...@@ -426,3 +426,5 @@ header-y += x25.h
header-y += xattr.h header-y += xattr.h
header-y += xfrm.h header-y += xfrm.h
header-y += hw_breakpoint.h header-y += hw_breakpoint.h
header-y += zorro.h
header-y += zorro_ids.h
include/uapi/linux/kexec.h
View file @ 8cf7a16e
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
*/ */
#define KEXEC_ARCH_DEFAULT ( 0 << 16) #define KEXEC_ARCH_DEFAULT ( 0 << 16)
#define KEXEC_ARCH_386 ( 3 << 16) #define KEXEC_ARCH_386 ( 3 << 16)
#define KEXEC_ARCH_68K ( 4 << 16)
#define KEXEC_ARCH_X86_64 (62 << 16) #define KEXEC_ARCH_X86_64 (62 << 16)
#define KEXEC_ARCH_PPC (20 << 16) #define KEXEC_ARCH_PPC (20 << 16)
#define KEXEC_ARCH_PPC64 (21 << 16) #define KEXEC_ARCH_PPC64 (21 << 16)
......
include/uapi/linux/zorro.h 0 → 100644
View file @ 8cf7a16e
/*
* linux/zorro.h -- Amiga AutoConfig (Zorro) Bus Definitions
*
* Copyright (C) 1995--2003 Geert Uytterhoeven
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file COPYING in the main directory of this archive
* for more details.
*/
#ifndef _UAPI_LINUX_ZORRO_H
#define _UAPI_LINUX_ZORRO_H
#include <linux/types.h>
/*
* Each Zorro board has a 32-bit ID of the form
*
* mmmmmmmmmmmmmmmmppppppppeeeeeeee
*
* with
*
* mmmmmmmmmmmmmmmm 16-bit Manufacturer ID (assigned by CBM (sigh))
* pppppppp 8-bit Product ID (assigned by manufacturer)
* eeeeeeee 8-bit Extended Product ID (currently only used
* for some GVP boards)
*/
#define ZORRO_MANUF(id) ((id) >> 16)
#define ZORRO_PROD(id) (((id) >> 8) & 0xff)
#define ZORRO_EPC(id) ((id) & 0xff)
#define ZORRO_ID(manuf, prod, epc) \
((ZORRO_MANUF_##manuf << 16) | ((prod) << 8) | (epc))
typedef __u32 zorro_id;
/* Include the ID list */
#include <linux/zorro_ids.h>
/*
* GVP identifies most of its products through the 'extended product code'
* (epc). The epc has to be ANDed with the GVP_PRODMASK before the
* identification.
*/
#define GVP_PRODMASK (0xf8)
#define GVP_SCSICLKMASK (0x01)
enum GVP_flags {
GVP_IO = 0x01,
GVP_ACCEL = 0x02,
GVP_SCSI = 0x04,
GVP_24BITDMA = 0x08,
GVP_25BITDMA = 0x10,
GVP_NOBANK = 0x20,
GVP_14MHZ = 0x40,
};
struct Node {
__be32 ln_Succ; /* Pointer to next (successor) */
__be32 ln_Pred; /* Pointer to previous (predecessor) */
__u8 ln_Type;
__s8 ln_Pri; /* Priority, for sorting */
__be32 ln_Name; /* ID string, null terminated */
} __packed;
struct ExpansionRom {
/* -First 16 bytes of the expansion ROM */
__u8 er_Type; /* Board type, size and flags */
__u8 er_Product; /* Product number, assigned by manufacturer */
__u8 er_Flags; /* Flags */
__u8 er_Reserved03; /* Must be zero ($ff inverted) */
__be16 er_Manufacturer; /* Unique ID, ASSIGNED BY COMMODORE-AMIGA! */
__be32 er_SerialNumber; /* Available for use by manufacturer */
__be16 er_InitDiagVec; /* Offset to optional "DiagArea" structure */
__u8 er_Reserved0c;
__u8 er_Reserved0d;
__u8 er_Reserved0e;
__u8 er_Reserved0f;
} __packed;
/* er_Type board type bits */
#define ERT_TYPEMASK 0xc0
#define ERT_ZORROII 0xc0
#define ERT_ZORROIII 0x80
/* other bits defined in er_Type */
#define ERTB_MEMLIST 5 /* Link RAM into free memory list */
#define ERTF_MEMLIST (1<<5)
struct ConfigDev {
struct Node cd_Node;
__u8 cd_Flags; /* (read/write) */
__u8 cd_Pad; /* reserved */
struct ExpansionRom cd_Rom; /* copy of board's expansion ROM */
__be32 cd_BoardAddr; /* where in memory the board was placed */
__be32 cd_BoardSize; /* size of board in bytes */
__be16 cd_SlotAddr; /* which slot number (PRIVATE) */
__be16 cd_SlotSize; /* number of slots (PRIVATE) */
__be32 cd_Driver; /* pointer to node of driver */
__be32 cd_NextCD; /* linked list of drivers to config */
__be32 cd_Unused[4]; /* for whatever the driver wants */
} __packed;
#define ZORRO_NUM_AUTO 16
#endif /* _UAPI_LINUX_ZORRO_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7