* PPC405GPr support patch (and a small CPCI405 update)
@ 2002-06-13 15:00 Stefan Roese
2002-06-13 15:43 ` Tom Rini
0 siblings, 1 reply; 2+ messages in thread
From: Stefan Roese @ 2002-06-13 15:00 UTC (permalink / raw)
To: Linuxppc-Embedded
[-- Attachment #1: Type: text/plain, Size: 447 bytes --]
Hi,
here is a small patch to support the new PPC405GPr (cputable.c).
Additionally I have included some updates for our CPCI405 board (rtc support
and default config update). This patch is against the current
linuxppc_2_4_devel tree.
By the way:
Upon looking into cputable.c I noticed that all NP4xx ppc's have the wrong
cache line size configured (total cache size in kB instead of cache line
size). May this cause some problems?
Ciao,
Stefan.
[-- Attachment #2: linuxppc_2_4_devel_2.4.19pre10.patch --]
[-- Type: application/octet-stream, Size: 14058 bytes --]
diff -N -u -r --exclude=CVS --exclude=LOG linuxppc_2_4_devel_2.4.19pre10_orig/linuxppc_2_4_devel/arch/ppc/configs/cpci405_defconfig linuxppc_2_4_devel_2.4.19pre10/linuxppc_2_4_devel/arch/ppc/configs/cpci405_defconfig
--- linuxppc_2_4_devel_2.4.19pre10_orig/linuxppc_2_4_devel/arch/ppc/configs/cpci405_defconfig Wed Apr 24 18:25:15 2002
+++ linuxppc_2_4_devel_2.4.19pre10/linuxppc_2_4_devel/arch/ppc/configs/cpci405_defconfig Thu Jun 13 16:29:59 2002
@@ -1,5 +1,5 @@
#
-# Automatically generated make config: don't edit
+# Automatically generated by make menuconfig: don't edit
#
# CONFIG_UID16 is not set
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
@@ -10,6 +10,7 @@
# Code maturity level options
#
CONFIG_EXPERIMENTAL=y
+# CONFIG_ADVANCED_OPTIONS is not set
#
# Loadable module support
@@ -25,14 +26,18 @@
CONFIG_PPC32=y
# CONFIG_6xx is not set
CONFIG_40x=y
+# CONFIG_440 is not set
# CONFIG_POWER3 is not set
# CONFIG_8xx is not set
# CONFIG_PPC_ISERIES is not set
+CONFIG_4xx=y
# CONFIG_PPC_STD_MMU is not set
+# CONFIG_ASH is not set
# CONFIG_CEDER is not set
CONFIG_CPCI405=y
# CONFIG_EP405 is not set
# CONFIG_OAK is not set
+# CONFIG_RAINIER is not set
# CONFIG_REDWOOD_4 is not set
# CONFIG_REDWOOD_5 is not set
# CONFIG_TIVO is not set
@@ -43,11 +48,14 @@
CONFIG_405GP=y
CONFIG_IBM405_ERR77=y
CONFIG_IBM_OCP=y
-# CONFIG_405_DMA is not set
+# CONFIG_PM is not set
CONFIG_UART0_TTYS0=y
# CONFIG_UART0_TTYS1 is not set
CONFIG_IBM405_ERR51=y
CONFIG_NOT_COHERENT_CACHE=y
+# CONFIG_PPC4xx_DMA is not set
+CONFIG_PPC4xx_EDMA=y
+CONFIG_OCP_PROC=y
#
# General setup
@@ -75,7 +83,7 @@
# Parallel port support
#
# CONFIG_PARPORT is not set
-# CONFIG_PPC_RTC is not set
+CONFIG_PPC_RTC=y
# CONFIG_CMDLINE_BOOL is not set
#
@@ -97,8 +105,10 @@
# CONFIG_PARIDE is not set
# CONFIG_BLK_CPQ_DA is not set
# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_CISS_SCSI_TAPE is not set
# CONFIG_BLK_DEV_DAC960 is not set
-CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_LOOP is not set
# CONFIG_BLK_DEV_NBD is not set
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=4096
@@ -141,10 +151,6 @@
# CONFIG_KHTTPD is not set
# CONFIG_ATM is not set
# CONFIG_VLAN_8021Q is not set
-
-#
-#
-#
# CONFIG_IPX is not set
# CONFIG_ATALK is not set
@@ -152,13 +158,6 @@
# Appletalk devices
#
# CONFIG_DEV_APPLETALK is not set
-# CONFIG_LTPC is not set
-# CONFIG_COPS is not set
-# CONFIG_COPS_DAYNA is not set
-# CONFIG_COPS_TANGENT is not set
-# CONFIG_IPDDP is not set
-# CONFIG_IPDDP_ENCAP is not set
-# CONFIG_IPDDP_DECAP is not set
# CONFIG_DECNET is not set
# CONFIG_BRIDGE is not set
# CONFIG_X25 is not set
@@ -176,6 +175,11 @@
# CONFIG_NET_SCHED is not set
#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+
+#
# ATA/IDE/MFM/RLL support
#
CONFIG_IDE=y
@@ -184,14 +188,11 @@
# IDE, ATA and ATAPI Block devices
#
CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
# CONFIG_BLK_DEV_HD_IDE is not set
# CONFIG_BLK_DEV_HD is not set
CONFIG_BLK_DEV_IDEDISK=y
# CONFIG_IDEDISK_MULTI_MODE is not set
+# CONFIG_IDEDISK_STROKE is not set
# CONFIG_BLK_DEV_IDEDISK_VENDOR is not set
# CONFIG_BLK_DEV_IDEDISK_FUJITSU is not set
# CONFIG_BLK_DEV_IDEDISK_IBM is not set
@@ -206,16 +207,13 @@
# CONFIG_BLK_DEV_IDETAPE is not set
# CONFIG_BLK_DEV_IDEFLOPPY is not set
# CONFIG_BLK_DEV_IDESCSI is not set
-
-#
-# IDE chipset support/bugfixes
-#
+# CONFIG_IDE_TASK_IOCTL is not set
# CONFIG_BLK_DEV_CMD640 is not set
# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
# CONFIG_BLK_DEV_ISAPNP is not set
# CONFIG_BLK_DEV_RZ1000 is not set
# CONFIG_BLK_DEV_IDEPCI is not set
-# CONFIG_BLK_DEV_SL82C105 is not set
+# CONFIG_IBM_OCP_IDE is not set
CONFIG_BLK_DEV_CPCI405_IDE=y
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
@@ -272,29 +270,7 @@
#
# Ethernet (10 or 100Mbit)
#
-CONFIG_NET_ETHERNET=y
-# CONFIG_MACE is not set
-# CONFIG_BMAC is not set
-# CONFIG_GMAC is not set
-CONFIG_IBM_OCP_ENET=y
-# CONFIG_IBM_OCP_ENET_ERROR_MSG is not set
-CONFIG_IBM_OCP_ENET_RX_BUFF=64
-CONFIG_IBM_OCP_ENET_TX_BUFF=8
-CONFIG_IBM_OCP_ENET_GAP=8
-# CONFIG_SUNLANCE is not set
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNBMAC is not set
-# CONFIG_SUNQE is not set
-# CONFIG_SUNLANCE is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_LANCE is not set
-# CONFIG_NET_VENDOR_SMC is not set
-# CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_HP100 is not set
-# CONFIG_NET_ISA is not set
-# CONFIG_NET_PCI is not set
-# CONFIG_NET_POCKET is not set
+# CONFIG_NET_ETHERNET is not set
#
# Ethernet (1000 Mbit)
@@ -306,6 +282,23 @@
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
# CONFIG_SK98LIN is not set
+# CONFIG_TIGON3 is not set
+
+#
+# Backplane Networking
+#
+# CONFIG_NPNET is not set
+
+#
+# On-chip net devices
+#
+CONFIG_IBM_OCP_ENET=y
+# CONFIG_IBM_OCP_ENET_ERROR_MSG is not set
+CONFIG_IBM_OCP_ENET_RX_BUFF=64
+CONFIG_IBM_OCP_ENET_TX_BUFF=8
+CONFIG_IBM_OCP_ENET_GAP=8
+CONFIG_IBM_OCP_ENET_SKB_RES=0
+CONFIG_OCP_NET=y
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
# CONFIG_PLIP is not set
@@ -388,8 +381,10 @@
CONFIG_I2C=y
# CONFIG_I2C_ALGOBIT is not set
# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_CHARDEV is not set
-# CONFIG_I2C_PROC is not set
+CONFIG_I2C_IBM_OCP_ALGO=y
+CONFIG_I2C_IBM_OCP_ADAP=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_PROC=y
#
# Mice
@@ -401,27 +396,18 @@
# Joysticks
#
# CONFIG_INPUT_GAMEPORT is not set
-
-#
-# Input core support is needed for gameports
-#
-
-#
-# Input core support is needed for joysticks
-#
# CONFIG_QIC02_TAPE is not set
#
# Watchdog Cards
#
# CONFIG_WATCHDOG is not set
-# CONFIG_INTEL_RNG is not set
# CONFIG_NVRAM is not set
# CONFIG_RTC is not set
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
-CONFIG_PPC405_GPIO=y
+# CONFIG_IBM_OCP_GPIO is not set
#
# Ftape, the floppy tape device driver
@@ -452,8 +438,8 @@
# CONFIG_EXT3_FS is not set
# CONFIG_JBD is not set
# CONFIG_JBD_DEBUG is not set
-# CONFIG_FAT_FS is not set
-# CONFIG_MSDOS_FS is not set
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
# CONFIG_UMSDOS_FS is not set
# CONFIG_VFAT_FS is not set
# CONFIG_EFS_FS is not set
@@ -461,7 +447,7 @@
# CONFIG_JFFS2_FS is not set
# CONFIG_CRAMFS is not set
CONFIG_TMPFS=y
-# CONFIG_RAMFS is not set
+CONFIG_RAMFS=y
# CONFIG_ISO9660_FS is not set
# CONFIG_JOLIET is not set
# CONFIG_ZISOFS is not set
@@ -491,12 +477,13 @@
# CONFIG_CODA_FS is not set
# CONFIG_INTERMEZZO_FS is not set
CONFIG_NFS_FS=y
-# CONFIG_NFS_V3 is not set
+CONFIG_NFS_V3=y
CONFIG_ROOT_NFS=y
# CONFIG_NFSD is not set
# CONFIG_NFSD_V3 is not set
CONFIG_SUNRPC=y
CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
# CONFIG_SMB_FS is not set
# CONFIG_NCP_FS is not set
# CONFIG_NCPFS_PACKET_SIGNING is not set
@@ -516,7 +503,49 @@
# CONFIG_PARTITION_ADVANCED is not set
CONFIG_MSDOS_PARTITION=y
# CONFIG_SMB_NLS is not set
-# CONFIG_NLS is not set
+CONFIG_NLS=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
#
# Sound
113not set
#
-# MPC4xx Driver Options
+# IBM 4xx options
#
#
# USB support
#
# CONFIG_USB is not set
-
-#
-# USB Controllers
-#
-# CONFIG_USB_UHCI is not set
-# CONFIG_USB_UHCI_ALT is not set
-# CONFIG_USB_OHCI is not set
-
-#
-# USB Device Class drivers
-#
-# CONFIG_USB_AUDIO is not set
-# CONFIG_USB_BLUETOOTH is not set
-# CONFIG_USB_STORAGE is not set
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_DPCM is not set
-# CONFIG_USB_STORAGE_HP8200e is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_PRINTER is not set
-
-#
-# USB Human Interface Devices (HID)
-#
-
-#
-# Input core support is needed for USB HID
-#
-
-#
-# USB Imaging devices
-#
-# CONFIG_USB_DC2XX is not set
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_SCANNER is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USB_HPUSBSCSI is not set
-
-#
-# USB Multimedia devices
-#
-
-#
-# Video4Linux support is needed for USB Multimedia device support
-#
-
-#
-# USB Network adaptors
-#
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_CDCETHER is not set
-# CONFIG_USB_USBNET is not set
-
-#
-# USB port drivers
-#
-# CONFIG_USB_USS720 is not set
-
-#
-# USB Serial Converter support
-#
-# CONFIG_USB_SERIAL is not set
-# CONFIG_USB_SERIAL_GENERIC is not set
-# CONFIG_USB_SERIAL_BELKIN is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
-# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-# CONFIG_USB_SERIAL_EMPEG is not set
-# CONFIG_USB_SERIAL_FTDI_SIO is not set
-# CONFIG_USB_SERIAL_VISOR is not set
-# CONFIG_USB_SERIAL_IPAQ is not set
-# CONFIG_USB_SERIAL_IR is not set
-# CONFIG_USB_SERIAL_EDGEPORT is not set
-# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-# CONFIG_USB_SERIAL_KEYSPAN is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
-# CONFIG_USB_SERIAL_MCT_U232 is not set
-# CONFIG_USB_SERIAL_KLSI is not set
-# CONFIG_USB_SERIAL_PL2303 is not set
-# CONFIG_USB_SERIAL_CYBERJACK is not set
-# CONFIG_USB_SERIAL_XIRCOM is not set
-# CONFIG_USB_SERIAL_OMNINET is not set
-
-#
-# USB Miscellaneous drivers
-#
-# CONFIG_USB_RIO500 is not set
#
# Bluetooth support
diff -N -u -r --exclude=CVS --exclude=LOG linuxppc_2_4_devel_2.4.19pre10_orig/linuxppc_2_4_devel/arch/ppc/kernel/cputable.c linuxppc_2_4_devel_2.4.19pre10/linuxppc_2_4_devel/arch/ppc/kernel/cputable.c
--- linuxppc_2_4_devel_2.4.19pre10_orig/linuxppc_2_4_devel/arch/ppc/kernel/cputable.c Wed Jun 5 10:01:00 2002
+++ linuxppc_2_4_devel_2.4.19pre10/linuxppc_2_4_devel/arch/ppc/kernel/cputable.c Thu Jun 13 13:54:56 2002
@@ -328,6 +328,13 @@
32, 32,
0, /*__setup_cpu_405 */
},
+ { /* 405GPr */
+ 0xffff0000, 0x50910000, "405GPr",
+ CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB,
+ PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
+ 32, 32,
+ 0, /*__setup_cpu_405 */
+ },
{ /* STB 03xxx */
0xffff0000, 0x40130000, "STB03xxx",
CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB,
diff -N -u -r --exclude=CVS --exclude=LOG linuxppc_2_4_devel_2.4.19pre10_orig/linuxppc_2_4_devel/arch/ppc/platforms/cpci405.c linuxppc_2_4_devel_2.4.19pre10/linuxppc_2_4_devel/arch/ppc/platforms/cpci405.c
--- linuxppc_2_4_devel_2.4.19pre10_orig/linuxppc_2_4_devel/arch/ppc/platforms/cpci405.c Wed Apr 24 18:25:18 2002
+++ linuxppc_2_4_devel_2.4.19pre10/linuxppc_2_4_devel/arch/ppc/platforms/cpci405.c Thu Jun 13 15:26:41 2002
@@ -26,6 +26,8 @@
#include <asm/machdep.h>
#include <asm/todc.h>
+void *cpci405_nvram;
+
/*
* Some IRQs unique to CPCI-405.
*/
@@ -53,11 +55,15 @@
void __init
board_setup_arch(void)
{
+#ifdef CONFIG_PPC_RTC
+ TODC_INIT(TODC_TYPE_MK48T35, cpci405_nvram, cpci405_nvram, cpci405_nvram, 8);
+#endif /* CONFIG_PPC_RTC */
}
void __init
board_io_mapping(void)
{
+ cpci405_nvram = ioremap(CPCI405_NVRAM_PADDR, CPCI405_NVRAM_SIZE);
}
void __init
diff -N -u -r --exclude=CVS --exclude=LOG linuxppc_2_4_devel_2.4.19pre10_orig/linuxppc_2_4_devel/arch/ppc/platforms/cpci405.h linuxppc_2_4_devel_2.4.19pre10/linuxppc_2_4_devel/arch/ppc/platforms/cpci405.h
--- linuxppc_2_4_devel_2.4.19pre10_orig/linuxppc_2_4_devel/arch/ppc/platforms/cpci405.h Wed Apr 24 18:25:18 2002
+++ linuxppc_2_4_devel_2.4.19pre10/linuxppc_2_4_devel/arch/ppc/platforms/cpci405.h Thu Jun 13 15:26:46 2002
@@ -18,6 +18,12 @@
*/
#define bi_tbfreq bi_intfreq
+extern void *cpci405_nvram;
+
+/* Map for the NVRAM space */
+#define CPCI405_NVRAM_PADDR ((uint)0xf0200000)
+#define CPCI405_NVRAM_SIZE ((uint)32*1024)
+
/* Early initialization address mapping for block_io.
* Standard 405GP map.
*/
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: PPC405GPr support patch (and a small CPCI405 update)
2002-06-13 15:00 PPC405GPr support patch (and a small CPCI405 update) Stefan Roese
@ 2002-06-13 15:43 ` Tom Rini
0 siblings, 0 replies; 2+ messages in thread
From: Tom Rini @ 2002-06-13 15:43 UTC (permalink / raw)
To: Stefan Roese; +Cc: Linuxppc-Embedded
On Thu, Jun 13, 2002 at 05:00:50PM +0200, Stefan Roese wrote:
> By the way:
> Upon looking into cputable.c I noticed that all NP4xx ppc's have the wrong
> cache line size configured (total cache size in kB instead of cache line
> size). May this cause some problems?
Well, if glibc ever makes use of those entries (see
http://bugs.debian.org/100657) it might. But for now, iirc it's
probably harmless. Patches accepted of course.
--
Tom Rini (TR1265)
http://gate.crashing.org/~trini/
** Sent via the linuxppc-embedded mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2002-06-13 15:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2002-06-13 15:00 PPC405GPr support patch (and a small CPCI405 update) Stefan Roese
2002-06-13 15:43 ` Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).