diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/brcm63xx/config-3.9 | 16 | ||||
| -rw-r--r-- | target/linux/brcm63xx/generic/config-default | 10 | ||||
| -rwxr-xr-x | target/linux/brcm63xx/image/Makefile | 7 | ||||
| -rw-r--r-- | target/linux/brcm63xx/smp/config-default | 10 |
4 files changed, 18 insertions, 25 deletions
diff --git a/target/linux/brcm63xx/config-3.9 b/target/linux/brcm63xx/config-3.9 index 5cbf10adf2..6d87c185d1 100644 --- a/target/linux/brcm63xx/config-3.9 +++ b/target/linux/brcm63xx/config-3.9 @@ -1,4 +1,3 @@ -# CONFIG_ALWAYS_USE_PERSISTENT_CLOCK is not set CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y CONFIG_ARCH_DISCARD_MEMBLOCK=y CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y @@ -15,6 +14,14 @@ CONFIG_B53_PHY_DRIVER=y CONFIG_B53_PHY_FIXUP=y CONFIG_B53_SPI_DRIVER=y CONFIG_BCM63XX=y +CONFIG_BCM63XX_CPU_3368=y +CONFIG_BCM63XX_CPU_6328=y +CONFIG_BCM63XX_CPU_6338=y +CONFIG_BCM63XX_CPU_6345=y +CONFIG_BCM63XX_CPU_6348=y +CONFIG_BCM63XX_CPU_6358=y +CONFIG_BCM63XX_CPU_6362=y +CONFIG_BCM63XX_CPU_6368=y CONFIG_BCM63XX_EHCI=y CONFIG_BCM63XX_ENET=y CONFIG_BCM63XX_OHCI=y @@ -29,10 +36,12 @@ CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=t CONFIG_CMDLINE_BOOL=y # CONFIG_CMDLINE_OVERRIDE is not set CONFIG_CPU_BIG_ENDIAN=y +# CONFIG_CPU_BMIPS is not set CONFIG_CPU_GENERIC_DUMP_TLB=y CONFIG_CPU_HAS_PREFETCH=y CONFIG_CPU_HAS_SYNC=y CONFIG_CPU_MIPS32=y +CONFIG_CPU_MIPS32_R1=y CONFIG_CPU_MIPSR1=y CONFIG_CPU_R4K_CACHE_TLB=y CONFIG_CPU_R4K_FPU=y @@ -97,6 +106,7 @@ CONFIG_IP_PIMSM_V2=y CONFIG_IRQ_CPU=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_WORK=y +CONFIG_KEXEC=y CONFIG_LEDS_GPIO=y CONFIG_M25PXX_USE_FAST_READ=y CONFIG_MDIO_BOARDINFO=y @@ -124,6 +134,7 @@ CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y +CONFIG_NR_CPUS_DEFAULT_2=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PCI=y # CONFIG_PCIEAER is not set @@ -160,6 +171,9 @@ CONFIG_SSB_PCIHOST_POSSIBLE=y CONFIG_SSB_SPROM=y CONFIG_SWAP_IO_SPACE=y CONFIG_SWCONFIG=y +CONFIG_SYS_HAS_CPU_BMIPS=y +CONFIG_SYS_HAS_CPU_BMIPS3300=y +CONFIG_SYS_HAS_CPU_BMIPS4350=y CONFIG_SYS_HAS_CPU_MIPS32_R1=y CONFIG_SYS_HAS_EARLY_PRINTK=y CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y diff --git a/target/linux/brcm63xx/generic/config-default b/target/linux/brcm63xx/generic/config-default deleted file mode 100644 index 202ac3ba60..0000000000 --- a/target/linux/brcm63xx/generic/config-default +++ /dev/null @@ -1,10 +0,0 @@ -CONFIG_BCM63XX_CPU_3368=y -CONFIG_BCM63XX_CPU_6328=y -CONFIG_BCM63XX_CPU_6338=y -CONFIG_BCM63XX_CPU_6345=y -CONFIG_BCM63XX_CPU_6348=y -CONFIG_BCM63XX_CPU_6358=y -CONFIG_BCM63XX_CPU_6362=y -CONFIG_BCM63XX_CPU_6368=y -CONFIG_CPU_MIPS32_R1=y -CONFIG_KEXEC=y diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile index 362738cd97..dc11c33705 100755 --- a/target/linux/brcm63xx/image/Makefile +++ b/target/linux/brcm63xx/image/Makefile @@ -165,7 +165,6 @@ endef define Image/Build dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync # Various routers - ifeq ($(CONFIG_TARGET_brcm63xx_generic),y) $(call Image/Build/CFE,$(1),96328avng,6328,96328avng-4M-flash-generic,,--pad 2) $(call Image/Build/CFE,$(1),96328avng,6328,96328avng-8M-flash-generic,,--pad 4) $(call Image/Build/CFE,$(1),96328avng,6328,96328avng-16M-flash-generic,,--pad 8) @@ -188,11 +187,9 @@ define Image/Build $(call Image/Build/CFE,$(1),96348A-122,6348,96348A-122-generic) $(call Image/Build/CFE,$(1),96358VW,6358,96358VW-generic) $(call Image/Build/CFE,$(1),96358VW2,6358,96358VW2-generic) - endif $(call Image/Build/CFE,$(1),96368MVNgr,6368,96368MVNgr-generic) $(call Image/Build/CFE,$(1),96368MVWG,6368,96368MVWG-generic) - ifeq ($(CONFIG_TARGET_brcm63xx_generic),y) # BT Voyager V210_BTR $(call Image/Build/CFE,$(1),V210_BB,6348,BTV210_BTR,,--layoutver 5) # BT Voyager V210_ROI, V210_WB @@ -217,12 +214,10 @@ define Image/Build $(call Image/Build/CFEFIXUP,$(1),96348GW,GW6200,6348,GW6200,$(shell printf '\x99')) # Neufbox4 $(call Image/Build/CFE,$(1),96358VW,6358,NEUFBOX4,OpenWRT-$(REVISION)) - endif # Neufbox6 $(call Image/Build/CFE,$(1),NB6-SER-r0,6362,NEUFBOX6,OpenWRT-$(REVISION)) - ifeq ($(CONFIG_TARGET_brcm63xx_generic),y) # Comtrend 6373 $(call Image/Build/CFE,$(1),CT6373-1,6358,CT6373) # Comtrend 536, 5621 @@ -293,7 +288,7 @@ define Image/Build # Netgear CVG834G $(call Image/Build/HCS,$(1),cvg834g,a020,0001,0022,$(KDIR)/vmlinux) - endif + ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) $(call Image/Build/Initramfs) endif diff --git a/target/linux/brcm63xx/smp/config-default b/target/linux/brcm63xx/smp/config-default index f68cd6ed2f..4e48e7760f 100644 --- a/target/linux/brcm63xx/smp/config-default +++ b/target/linux/brcm63xx/smp/config-default @@ -1,22 +1,16 @@ -# CONFIG_BCM63XX_CPU_6328 is not set -# CONFIG_BCM63XX_CPU_6338 is not set -# CONFIG_BCM63XX_CPU_6345 is not set -# CONFIG_BCM63XX_CPU_6348 is not set -# CONFIG_BCM63XX_CPU_6358 is not set -CONFIG_BCM63XX_CPU_6362=y -CONFIG_BCM63XX_CPU_6368=y CONFIG_CPU_BMIPS=y +CONFIG_CPU_BMIPS3300=y CONFIG_CPU_BMIPS4350=y # CONFIG_CPU_MIPS32_R1 is not set CONFIG_CPU_RMAP=y # CONFIG_KEXEC is not set CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NR_CPUS=2 +CONFIG_RCU_STALL_COMMON=y CONFIG_RFS_ACCEL=y CONFIG_RPS=y CONFIG_SMP=y CONFIG_STOP_MACHINE=y -CONFIG_SYS_HAS_CPU_BMIPS4350=y CONFIG_SYS_SUPPORTS_HOTPLUG_CPU=y CONFIG_SYS_SUPPORTS_SMP=y CONFIG_TREE_RCU=y |