Skip to content

Commit 0af2de7

Browse files
linuswarndb
authored andcommitted
ARM: config: Refresh IXP4xx config after multiplatform
After converting to multiplatform the old IXP4xx defconfig doesn't even activate the ethernet driver anymore, we need to refresh this thoroughly. - Drop options that ARCH_MULTI_V5 selects for us. - Some options moved around because of multiplatform and because generic Kconfig movements. - Drop all MACH_* that do not exist anymore. - Compress the kernel and initramfs with XZ as the memory is often limited for these machines. - Make sure IXP4XX_QMGR and IXP4XX_NPE is selected. - Make sure the MTD_PHYSMAP_IXP4XX is selected and not the old MTD_IXP4XX (will be deleted). - Activate CRYPTO_DEV_IXP4XX - Add some very basic default drivers such as AT24 EEPROMs used in many routers. - Add some kernel configs needed to bring up OpenWrt which is the only userspace for these devices: CGROUPS, DEVTMPFS, INOTIFY_USER, SIGNALFD, TIMERFD, EPOLL, OVERLAY_FS and SQUASHFS. Signed-off-by: Linus Walleij <[email protected]> Cc: Arnd Bergmann <[email protected]> Cc: Krzysztof Halasa <[email protected]> Cc: Imre Kaloz <[email protected]> Link: https://lore.kernel.org/r/[email protected]' Signed-off-by: Arnd Bergmann <[email protected]>
1 parent 766475c commit 0af2de7

File tree

1 file changed

+34
-53
lines changed

1 file changed

+34
-53
lines changed

arch/arm/configs/ixp4xx_defconfig

Lines changed: 34 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,22 @@
1+
CONFIG_KERNEL_XZ=y
12
CONFIG_SYSVIPC=y
23
CONFIG_BSD_PROCESS_ACCT=y
34
CONFIG_LOG_BUF_SHIFT=14
5+
CONFIG_CGROUPS=y
46
CONFIG_BLK_DEV_INITRD=y
7+
CONFIG_INITRAMFS_COMPRESSION_XZ=y
58
CONFIG_EXPERT=y
6-
CONFIG_MODULES=y
7-
CONFIG_MODVERSIONS=y
8-
# CONFIG_BLK_DEV_BSG is not set
99
# CONFIG_ARCH_MULTI_V7 is not set
1010
CONFIG_ARCH_IXP4XX=y
11-
CONFIG_MACH_NSLU2=y
12-
CONFIG_MACH_AVILA=y
13-
CONFIG_MACH_LOFT=y
14-
CONFIG_ARCH_ADI_COYOTE=y
15-
CONFIG_MACH_GATEWAY7001=y
16-
CONFIG_MACH_WG302V2=y
17-
CONFIG_ARCH_IXDP425=y
18-
CONFIG_MACH_IXDPG425=y
19-
CONFIG_MACH_IXDP465=y
20-
CONFIG_MACH_KIXRP435=y
21-
CONFIG_ARCH_PRPMC1100=y
22-
CONFIG_MACH_NAS100D=y
23-
CONFIG_MACH_DSMG600=y
24-
CONFIG_MACH_FSG=y
25-
CONFIG_MACH_GTWX5715=y
26-
CONFIG_IXP4XX_QMGR=y
27-
CONFIG_IXP4XX_NPE=y
2811
# CONFIG_ARM_THUMB is not set
2912
CONFIG_CPU_BIG_ENDIAN=y
3013
CONFIG_AEABI=y
31-
CONFIG_ZBOOT_ROM_TEXT=0x0
32-
CONFIG_ZBOOT_ROM_BSS=0x0
33-
CONFIG_CMDLINE="console=ttyS0,115200 ip=bootp root=/dev/nfs"
34-
CONFIG_FPE_NWFPE=y
14+
CONFIG_CMDLINE="console=ttyS0,115200"
15+
CONFIG_STRICT_KERNEL_RWX=y
16+
CONFIG_STRICT_MODULE_RWX=y
17+
CONFIG_MODULES=y
18+
CONFIG_MODVERSIONS=y
19+
CONFIG_PARTITION_ADVANCED=y
3520
CONFIG_NET=y
3621
CONFIG_PACKET=y
3722
CONFIG_UNIX=y
@@ -44,8 +29,6 @@ CONFIG_IP_ROUTE_VERBOSE=y
4429
CONFIG_IP_PNP=y
4530
CONFIG_IP_PNP_DHCP=y
4631
CONFIG_IP_PNP_BOOTP=y
47-
CONFIG_NET_IPGRE=m
48-
CONFIG_NET_IPGRE_BROADCAST=y
4932
CONFIG_IP_MROUTE=y
5033
CONFIG_IP_PIMSM_V1=y
5134
CONFIG_IP_PIMSM_V2=y
@@ -66,7 +49,6 @@ CONFIG_IP_NF_IPTABLES=m
6649
CONFIG_IP_NF_MATCH_TTL=m
6750
CONFIG_IP_NF_FILTER=m
6851
CONFIG_IP_NF_TARGET_REJECT=m
69-
CONFIG_IP_NF_TARGET_LOG=m
7052
CONFIG_IP_NF_MANGLE=m
7153
CONFIG_IP_NF_ARPTABLES=m
7254
CONFIG_IP_NF_ARPFILTER=m
@@ -77,14 +59,12 @@ CONFIG_ATM_MPOA=m
7759
CONFIG_ATM_BR2684=m
7860
CONFIG_BRIDGE=m
7961
CONFIG_VLAN_8021Q=m
80-
CONFIG_IPX=m
8162
CONFIG_ATALK=m
8263
CONFIG_DEV_APPLETALK=m
8364
CONFIG_IPDDP=m
8465
CONFIG_IPDDP_ENCAP=y
8566
CONFIG_X25=m
8667
CONFIG_LAPB=m
87-
CONFIG_WAN_ROUTER=m
8868
CONFIG_NET_SCHED=y
8969
CONFIG_NET_SCH_CBQ=m
9070
CONFIG_NET_SCH_HTB=m
@@ -105,91 +85,92 @@ CONFIG_NET_CLS_RSVP6=m
10585
CONFIG_NET_CLS_ACT=y
10686
CONFIG_NET_ACT_POLICE=y
10787
CONFIG_NET_PKTGEN=m
88+
CONFIG_DEVTMPFS=y
10889
CONFIG_MTD=y
10990
CONFIG_MTD_REDBOOT_PARTS=y
11091
CONFIG_MTD_BLOCK=y
11192
CONFIG_MTD_CFI=y
11293
CONFIG_MTD_CFI_INTELEXT=y
94+
CONFIG_MTD_COMPLEX_MAPPINGS=y
11395
CONFIG_MTD_PHYSMAP=y
11496
CONFIG_MTD_PHYSMAP_OF=y
115-
CONFIG_MTD_COMPLEX_MAPPINGS=y
116-
CONFIG_MTD_IXP4XX=y
97+
CONFIG_MTD_PHYSMAP_IXP4XX=y
11798
CONFIG_MTD_RAW_NAND=m
11899
CONFIG_BLK_DEV_LOOP=y
119100
CONFIG_BLK_DEV_RAM=y
120101
CONFIG_BLK_DEV_RAM_SIZE=8192
102+
CONFIG_EEPROM_AT24=y
121103
CONFIG_EEPROM_LEGACY=y
122104
# CONFIG_SCSI_PROC_FS is not set
123105
CONFIG_BLK_DEV_SD=y
106+
# CONFIG_BLK_DEV_BSG is not set
124107
# CONFIG_SCSI_LOWLEVEL is not set
125108
CONFIG_ATA=y
126-
CONFIG_SATA_VIA=y
127-
CONFIG_PATA_ARTOP=y
128-
CONFIG_PATA_CMD64X=y
129-
CONFIG_PATA_HPT366=y
130-
CONFIG_PATA_HPT37X=y
131-
CONFIG_PATA_HPT3X2N=y
132-
CONFIG_PATA_PDC2027X=y
133109
CONFIG_PATA_IXP4XX_CF=y
134110
CONFIG_NETDEVICES=y
135111
CONFIG_DUMMY=y
136-
CONFIG_NET_ETHERNET=y
137-
CONFIG_MII=y
112+
CONFIG_ATM_TCP=m
138113
CONFIG_IXP4XX_ETH=y
139-
CONFIG_NET_PCI=y
140114
CONFIG_WAN=y
141-
CONFIG_HDLC=m
115+
CONFIG_HDLC=y
142116
CONFIG_HDLC_RAW=m
143117
CONFIG_HDLC_CISCO=m
144118
CONFIG_HDLC_FR=m
145119
CONFIG_HDLC_PPP=m
146-
CONFIG_HDLC_X25=m
147-
CONFIG_WAN_ROUTER_DRIVERS=m
148-
CONFIG_ATM_TCP=m
149-
# CONFIG_INPUT_KEYBOARD is not set
120+
CONFIG_IXP4XX_HSS=m
121+
# CONFIG_KEYBOARD_ATKBD is not set
122+
CONFIG_KEYBOARD_GPIO=y
150123
# CONFIG_INPUT_MOUSE is not set
151124
CONFIG_INPUT_MISC=y
152-
CONFIG_INPUT_IXP4XX_BEEPER=y
153125
# CONFIG_SERIO is not set
154126
# CONFIG_VT is not set
155127
CONFIG_SERIAL_8250=y
156128
CONFIG_SERIAL_8250_CONSOLE=y
157129
CONFIG_SERIAL_8250_NR_UARTS=2
130+
CONFIG_SERIAL_8250_RUNTIME_UARTS=2
158131
CONFIG_SERIAL_OF_PLATFORM=y
159-
CONFIG_I2C=y
132+
CONFIG_HW_RANDOM=y
160133
CONFIG_I2C_CHARDEV=y
134+
CONFIG_I2C_GPIO=y
135+
CONFIG_GPIO_GW_PLD=y
136+
CONFIG_GPIO_PCA953X=y
137+
CONFIG_SENSORS_AD7418=y
161138
CONFIG_SENSORS_W83781D=y
162139
CONFIG_WATCHDOG=y
163140
CONFIG_IXP4XX_WATCHDOG=y
164141
CONFIG_USB=y
165142
CONFIG_USB_EHCI_HCD=y
166143
CONFIG_USB_OHCI_HCD=y
167-
CONFIG_USB_UHCI_HCD=y
168144
CONFIG_USB_STORAGE=y
169145
CONFIG_NEW_LEDS=y
170146
CONFIG_LEDS_CLASS=y
171-
CONFIG_LEDS_FSG=y
172147
CONFIG_LEDS_GPIO=y
173148
CONFIG_LEDS_TRIGGERS=y
174149
CONFIG_LEDS_TRIGGER_TIMER=y
175150
CONFIG_LEDS_TRIGGER_DISK=y
176151
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
177152
CONFIG_RTC_CLASS=y
153+
CONFIG_RTC_DRV_DS1672=y
178154
CONFIG_RTC_DRV_ISL1208=y
179155
CONFIG_RTC_DRV_X1205=y
180156
CONFIG_RTC_DRV_PCF8563=y
157+
CONFIG_IXP4XX_QMGR=y
158+
CONFIG_IXP4XX_NPE=y
181159
CONFIG_EXT2_FS=y
182160
CONFIG_EXT2_FS_XATTR=y
183161
CONFIG_EXT2_FS_POSIX_ACL=y
184162
CONFIG_EXT3_FS=y
185163
CONFIG_EXT3_FS_POSIX_ACL=y
164+
CONFIG_OVERLAY_FS=y
186165
CONFIG_TMPFS=y
166+
CONFIG_TMPFS_POSIX_ACL=y
187167
CONFIG_JFFS2_FS=y
168+
CONFIG_SQUASHFS=y
169+
CONFIG_SQUASHFS_XZ=y
188170
CONFIG_NFS_FS=y
189-
CONFIG_NFS_V3=y
190171
CONFIG_ROOT_NFS=y
191-
CONFIG_PARTITION_ADVANCED=y
172+
CONFIG_CRYPTO_DEV_IXP4XX=y
192173
CONFIG_MAGIC_SYSRQ=y
193-
CONFIG_DEBUG_KERNEL=y
174+
CONFIG_DEBUG_FS=y
194175
CONFIG_DEBUG_LL=y
195176
CONFIG_DEBUG_LL_UART_8250=y

0 commit comments

Comments
 (0)