Explorar o código

upgrade to 3.2, disable ppp by default until we figure out why ppp_generic breaks bootup

SVN-Revision: 31020
Imre Kaloz %!s(int64=13) %!d(string=hai) anos
pai
achega
cb41fa7655
Modificáronse 2 ficheiros con 15 adicións e 2 borrados
  1. 4 2
      target/linux/ppc44x/Makefile
  2. 11 0
      target/linux/ppc44x/config-default

+ 4 - 2
target/linux/ppc44x/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2011 OpenWrt.org
+# Copyright (C) 2007-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -13,10 +13,12 @@ FEATURES:=squashfs
 CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=440
 MAINTAINER:=Imre Kaloz <[email protected]>
 
-LINUX_VERSION:=3.0.18
+LINUX_VERSION:=3.2.11
 
 include $(INCLUDE_DIR)/target.mk
 
+DEFAULT_PACKAGES := $(filter-out ppp%,$(DEFAULT_PACKAGES))
+
 define Target/Description
 	Build firmware images for AMCC/IBM PPC44x based boards.
 endef

+ 11 - 0
target/linux/ppc44x/config-default

@@ -77,6 +77,17 @@ CONFIG_HW_RANDOM=y
 # CONFIG_HZ_100 is not set
 CONFIG_HZ=250
 CONFIG_HZ_250=y
+# CONFIG_IBM_EMAC_DEBUG is not set
+CONFIG_IBM_EMAC_EMAC4=y
+CONFIG_IBM_EMAC_POLL_WEIGHT=32
+CONFIG_IBM_EMAC_RGMII=y
+CONFIG_IBM_EMAC_RXB=128
+CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256
+CONFIG_IBM_EMAC_RX_SKB_HEADROOM=0
+CONFIG_IBM_EMAC_TAH=y
+CONFIG_IBM_EMAC_TXB=128
+CONFIG_IBM_EMAC=y
+CONFIG_IBM_EMAC_ZMII=y
 # CONFIG_IBM_NEW_EMAC_DEBUG is not set
 CONFIG_IBM_NEW_EMAC_EMAC4=y
 CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32