PPC44x updates
PATCH 1/1 PPC44x updates
Update PPC44x defconfigs and some fixes.
Signed-off-by Matt Porter <[email protected]>
===== arch/ppc/configs/ebony_defconfig 1.6 vs edited =====
arch/ppc/configs/ebony_defconfig +19 -3
@@ -30,6 +30,7 @@ # CONFIG_IKCONFIG is not set CONFIG_EMBEDDED=y CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_IOSCHED_NOOP=y
@@ -56,6 +57,8 @@ # CONFIG_POWER3 is not set # CONFIG_POWER4 is not set # CONFIG_8xx is not set +# CONFIG_E500 is not set +CONFIG_BOOKE=y CONFIG_PTE_64BIT=y # CONFIG_MATH_EMULATION is not set # CONFIG_CPU_FREQ is not set
@@ -68,7 +71,6 @@ # CONFIG_OCOTEA is not set CONFIG_440GP=y CONFIG_440=y -CONFIG_BOOKE=y CONFIG_IBM_OCP=y # CONFIG_PM is not set CONFIG_NOT_COHERENT_CACHE=y
@@ -106,6 +108,8 @@ CONFIG_LOWMEM_SIZE=0x30000000 CONFIG_KERNEL_START=0xc0000000 CONFIG_TASK_SIZE=0x80000000 +CONFIG_CONSISTENT_START=0xff100000 +CONFIG_CONSISTENT_SIZE=0x00200000 CONFIG_BOOT_LOAD=0x01000000 #
@@ -115,6 +119,7 @@ # # Generic Driver Options # +CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_DEBUG_DRIVER is not set #
@@ -141,7 +146,7 @@ # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_NBD is not set -# CONFIG_BLK_DEV_CARMEL is not set +# CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_RAM is not set CONFIG_LBD=y
@@ -247,6 +252,7 @@ # QoS and/or fair queueing # # CONFIG_NET_SCHED is not set +# CONFIG_NET_CLS_ROUTE is not set # # Network testing
@@ -272,6 +278,12 @@ # Ethernet (10 or 100Mbit) # # CONFIG_NET_ETHERNET is not set +CONFIG_IBM_EMAC=y +# CONFIG_IBM_EMAC_ERRMSG is not set +CONFIG_IBM_EMAC_RXB=64 +CONFIG_IBM_EMAC_TXB=8 +CONFIG_IBM_EMAC_FGAP=8 +CONFIG_IBM_EMAC_SKBRES=0 # # Ethernet (1000 Mbit)
@@ -310,7 +322,6 @@ # CONFIG_HIPPI is not set # CONFIG_PPP is not set # CONFIG_SLIP is not set -# CONFIG_RCPCI is not set # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set
@@ -543,6 +554,11 @@ # CONFIG_CRC32=y # CONFIG_LIBCRC32C is not set + +# +# Profiling support +# +# CONFIG_PROFILING is not set # # Kernel hacking
===== arch/ppc/configs/ocotea_defconfig 1.4 vs edited =====
arch/ppc/configs/ocotea_defconfig +47 -47
232 lines not on this page · raw message
===== arch/ppc/kernel/head_44x.S 1.9 vs edited =====
arch/ppc/kernel/head_44x.S +2 -2
@@ -177,11 +177,11 @@ rfi /* If necessary, invalidate original entry we used */ -3: cmpwi r23,62 +3: cmpwi r23,63 beq 4f li r6,0 tlbwe r6,r23,PPC44x_TLB_PAGEID - sync + isync 4: #ifdef CONFIG_SERIAL_TEXT_DEBUG
===== arch/ppc/syslib/ibm440gp_common.c 1.4 vs edited =====
arch/ppc/syslib/ibm440gp_common.c +2 -4
@@ -30,7 +30,8 @@ {u32 cpc0_sys0 =mfdcr (DCRN_CPC0_SYS0 );u32 cpc0_cr0 =mfdcr (DCRN_CPC0_CR0 ); -u32 opdv, epdv; +u32 opdv = ((cpc0_sys0 >>10 ) &0x3 ) +1 ; +u32 epdv = ((cpc0_sys0 >>8 ) &0x3 ) +1 ;if (cpc0_sys0 &0x2 ){/* Bypass system PLL */
@@ -59,9 +60,6 @@ p->cpu = vco / fwdva; p->plb = vco / fwdvb; } - - opdv = ((cpc0_sys0 >>10 ) &0x3 ) +1 ; - epdv = ((cpc0_sys0 >>8 ) &0x3 ) +1 ; p->opb = p->plb / opdv; p->ebc = p->opb / epdv;