diff options
| author | Kumar Gala <galak@freescale.com> | 2005-09-03 18:55:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:05:53 -0400 |
| commit | f4f1269cb36adfb452c04dcb3d40f51b8a1956bb (patch) | |
| tree | f078687fe13c314dabb8c68e1f50f8d99632b500 /arch | |
| parent | a3800d8ffa0a91f3047cbfa82e435d483ffc8dd4 (diff) | |
[PATCH] ppc32: Remove board support for ASH
Support for the ASH board is no longer maintained and thus being removed
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ppc/boot/simple/embed_config.c | 2 | ||||
| -rw-r--r-- | arch/ppc/configs/ash_defconfig | 666 | ||||
| -rw-r--r-- | arch/ppc/platforms/4xx/Kconfig | 5 | ||||
| -rw-r--r-- | arch/ppc/platforms/4xx/Makefile | 1 | ||||
| -rw-r--r-- | arch/ppc/platforms/4xx/ash.c | 250 | ||||
| -rw-r--r-- | arch/ppc/platforms/4xx/ash.h | 83 | ||||
| -rw-r--r-- | arch/ppc/syslib/ppc4xx_setup.c | 2 |
7 files changed, 2 insertions, 1007 deletions
diff --git a/arch/ppc/boot/simple/embed_config.c b/arch/ppc/boot/simple/embed_config.c index c342b47e763e..8dd5fb0fb775 100644 --- a/arch/ppc/boot/simple/embed_config.c +++ b/arch/ppc/boot/simple/embed_config.c | |||
| @@ -784,7 +784,7 @@ embed_config(bd_t ** bdp) | |||
| 784 | #ifdef CONFIG_IBM_OPENBIOS | 784 | #ifdef CONFIG_IBM_OPENBIOS |
| 785 | /* This could possibly work for all treeboot roms. | 785 | /* This could possibly work for all treeboot roms. |
| 786 | */ | 786 | */ |
| 787 | #if defined(CONFIG_ASH) || defined(CONFIG_BEECH) || defined(CONFIG_BUBINGA) | 787 | #if defined(CONFIG_BEECH) || defined(CONFIG_BUBINGA) |
| 788 | #define BOARD_INFO_VECTOR 0xFFF80B50 /* openbios 1.19 moved this vector down - armin */ | 788 | #define BOARD_INFO_VECTOR 0xFFF80B50 /* openbios 1.19 moved this vector down - armin */ |
| 789 | #else | 789 | #else |
| 790 | #define BOARD_INFO_VECTOR 0xFFFE0B50 | 790 | #define BOARD_INFO_VECTOR 0xFFFE0B50 |
diff --git a/arch/ppc/configs/ash_defconfig b/arch/ppc/configs/ash_defconfig deleted file mode 100644 index c4a73cc16cf6..000000000000 --- a/arch/ppc/configs/ash_defconfig +++ /dev/null | |||
| @@ -1,666 +0,0 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # | ||
| 4 | CONFIG_MMU=y | ||
| 5 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | ||
| 6 | CONFIG_HAVE_DEC_LOCK=y | ||
| 7 | CONFIG_PPC=y | ||
| 8 | CONFIG_PPC32=y | ||
| 9 | CONFIG_GENERIC_NVRAM=y | ||
| 10 | |||
| 11 | # | ||
| 12 | # Code maturity level options | ||
| 13 | # | ||
| 14 | CONFIG_EXPERIMENTAL=y | ||
| 15 | CONFIG_CLEAN_COMPILE=y | ||
| 16 | CONFIG_STANDALONE=y | ||
| 17 | CONFIG_BROKEN_ON_SMP=y | ||
| 18 | |||
| 19 | # | ||
| 20 | # General setup | ||
| 21 | # | ||
| 22 | CONFIG_SWAP=y | ||
| 23 | CONFIG_SYSVIPC=y | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 27 | # CONFIG_HOTPLUG is not set | ||
| 28 | # CONFIG_IKCONFIG is not set | ||
| 29 | CONFIG_EMBEDDED=y | ||
| 30 | # CONFIG_KALLSYMS is not set | ||
| 31 | CONFIG_FUTEX=y | ||
| 32 | # CONFIG_EPOLL is not set | ||
| 33 | CONFIG_IOSCHED_NOOP=y | ||
| 34 | CONFIG_IOSCHED_AS=y | ||
| 35 | CONFIG_IOSCHED_DEADLINE=y | ||
| 36 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 37 | |||
| 38 | # | ||
| 39 | # Loadable module support | ||
| 40 | # | ||
| 41 | CONFIG_MODULES=y | ||
| 42 | CONFIG_MODULE_UNLOAD=y | ||
| 43 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 44 | CONFIG_OBSOLETE_MODPARM=y | ||
| 45 | # CONFIG_MODVERSIONS is not set | ||
| 46 | CONFIG_KMOD=y | ||
| 47 | |||
| 48 | # | ||
| 49 | # Processor | ||
| 50 | # | ||
| 51 | # CONFIG_6xx is not set | ||
| 52 | CONFIG_40x=y | ||
| 53 | # CONFIG_44x is not set | ||
| 54 | # CONFIG_POWER3 is not set | ||
| 55 | # CONFIG_POWER4 is not set | ||
| 56 | # CONFIG_8xx is not set | ||
| 57 | # CONFIG_MATH_EMULATION is not set | ||
| 58 | # CONFIG_CPU_FREQ is not set | ||
| 59 | CONFIG_4xx=y | ||
| 60 | |||
| 61 | # | ||
| 62 | # IBM 4xx options | ||
| 63 | # | ||
| 64 | CONFIG_ASH=y | ||
| 65 | # CONFIG_CPCI405 is not set | ||
| 66 | # CONFIG_EP405 is not set | ||
| 67 | # CONFIG_EVB405EP is not set | ||
| 68 | # CONFIG_OAK is not set | ||
| 69 | # CONFIG_REDWOOD_5 is not set | ||
| 70 | # CONFIG_REDWOOD_6 is not set | ||
| 71 | # CONFIG_SYCAMORE is not set | ||
| 72 | # CONFIG_WALNUT is not set | ||
| 73 | CONFIG_NP405H=y | ||
| 74 | CONFIG_IBM405_ERR77=y | ||
| 75 | CONFIG_IBM405_ERR51=y | ||
| 76 | CONFIG_IBM_OCP=y | ||
| 77 | CONFIG_PPC_OCP=y | ||
| 78 | CONFIG_IBM_OPENBIOS=y | ||
| 79 | # CONFIG_PM is not set | ||
| 80 | CONFIG_UART0_TTYS0=y | ||
| 81 | # CONFIG_UART0_TTYS1 is not set | ||
| 82 | CONFIG_NOT_COHERENT_CACHE=y | ||
| 83 | |||
| 84 | # | ||
| 85 | # Platform options | ||
| 86 | # | ||
| 87 | # CONFIG_PC_KEYBOARD is not set | ||
| 88 | # CONFIG_SMP is not set | ||
| 89 | # CONFIG_PREEMPT is not set | ||
| 90 | # CONFIG_HIGHMEM is not set | ||
| 91 | CONFIG_KERNEL_ELF=y | ||
| 92 | CONFIG_BINFMT_ELF=y | ||
| 93 | # CONFIG_BINFMT_MISC is not set | ||
| 94 | CONFIG_CMDLINE_BOOL=y | ||
| 95 | CONFIG_CMDLINE="ip=on" | ||
| 96 | |||
| 97 | # | ||
| 98 | # Bus options | ||
| 99 | # | ||
| 100 | CONFIG_PCI=y | ||
| 101 | CONFIG_PCI_DOMAINS=y | ||
| 102 | CONFIG_PCI_LEGACY_PROC=y | ||
| 103 | # CONFIG_PCI_NAMES is not set | ||
| 104 | |||
| 105 | # | ||
| 106 | # Advanced setup | ||
| 107 | # | ||
| 108 | # CONFIG_ADVANCED_OPTIONS is not set | ||
| 109 | |||
| 110 | # | ||
| 111 | # Default settings for advanced configuration options are used | ||
| 112 | # | ||
| 113 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 114 | CONFIG_LOWMEM_SIZE=0x30000000 | ||
| 115 | CONFIG_KERNEL_START=0xc0000000 | ||
| 116 | CONFIG_TASK_SIZE=0x80000000 | ||
| 117 | CONFIG_BOOT_LOAD=0x00400000 | ||
| 118 | |||
| 119 | # | ||
| 120 | # Device Drivers | ||
| 121 | # | ||
| 122 | |||
| 123 | # | ||
| 124 | # Generic Driver Options | ||
| 125 | # | ||
| 126 | |||
| 127 | # | ||
| 128 | # Memory Technology Devices (MTD) | ||
| 129 | # | ||
| 130 | # CONFIG_MTD is not set | ||
| 131 | |||
| 132 | # | ||
| 133 | # Parallel port support | ||
| 134 | # | ||
| 135 | # CONFIG_PARPORT is not set | ||
| 136 | |||
| 137 | # | ||
| 138 | # Plug and Play support | ||
| 139 | # | ||
| 140 | |||
| 141 | # | ||
| 142 | # Block devices | ||
| 143 | # | ||
| 144 | # CONFIG_BLK_DEV_FD is not set | ||
| 145 | # CONFIG_BLK_CPQ_DA is not set | ||
| 146 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
| 147 | # CONFIG_BLK_DEV_DAC960 is not set | ||
| 148 | # CONFIG_BLK_DEV_UMEM is not set | ||
| 149 | CONFIG_BLK_DEV_LOOP=y | ||
| 150 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 151 | # CONFIG_BLK_DEV_NBD is not set | ||
| 152 | # CONFIG_BLK_DEV_CARMEL is not set | ||
| 153 | CONFIG_BLK_DEV_RAM=y | ||
| 154 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
| 155 | CONFIG_BLK_DEV_INITRD=y | ||
| 156 | # CONFIG_LBD is not set | ||
| 157 | |||
| 158 | # | ||
| 159 | # ATA/ATAPI/MFM/RLL support | ||
| 160 | # | ||
| 161 | # CONFIG_IDE is not set | ||
| 162 | |||
| 163 | # | ||
| 164 | # SCSI device support | ||
| 165 | # | ||
| 166 | # CONFIG_SCSI is not set | ||
| 167 | |||
| 168 | # | ||
| 169 | # Multi-device support (RAID and LVM) | ||
| 170 | # | ||
| 171 | # CONFIG_MD is not set | ||
| 172 | |||
| 173 | # | ||
| 174 | # Fusion MPT device support | ||
| 175 | # | ||
| 176 | # CONFIG_FUSION is not set | ||
| 177 | |||
| 178 | # | ||
| 179 | # IEEE 1394 (FireWire) support | ||
| 180 | # | ||
| 181 | # CONFIG_IEEE1394 is not set | ||
| 182 | |||
| 183 | # | ||
| 184 | # I2O device support | ||
| 185 | # | ||
| 186 | # CONFIG_I2O is not set | ||
| 187 | |||
| 188 | # | ||
| 189 | # Macintosh device drivers | ||
| 190 | # | ||
| 191 | |||
| 192 | # | ||
| 193 | # Networking support | ||
| 194 | # | ||
| 195 | CONFIG_NET=y | ||
| 196 | |||
| 197 | # | ||
| 198 | # Networking options | ||
| 199 | # | ||
| 200 | # CONFIG_PACKET is not set | ||
| 201 | # CONFIG_NETLINK_DEV is not set | ||
| 202 | CONFIG_UNIX=y | ||
| 203 | # CONFIG_NET_KEY is not set | ||
| 204 | CONFIG_INET=y | ||
| 205 | CONFIG_IP_MULTICAST=y | ||
| 206 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 207 | CONFIG_IP_PNP=y | ||
| 208 | # CONFIG_IP_PNP_DHCP is not set | ||
| 209 | CONFIG_IP_PNP_BOOTP=y | ||
| 210 | # CONFIG_IP_PNP_RARP is not set | ||
| 211 | # CONFIG_NET_IPIP is not set | ||
| 212 | # CONFIG_NET_IPGRE is not set | ||
| 213 | # CONFIG_IP_MROUTE is not set | ||
| 214 | # CONFIG_ARPD is not set | ||
| 215 | CONFIG_SYN_COOKIES=y | ||
| 216 | # CONFIG_INET_AH is not set | ||
| 217 | # CONFIG_INET_ESP is not set | ||
| 218 | # CONFIG_INET_IPCOMP is not set | ||
| 219 | # CONFIG_IPV6 is not set | ||
| 220 | # CONFIG_DECNET is not set | ||
| 221 | # CONFIG_BRIDGE is not set | ||
| 222 | # CONFIG_NETFILTER is not set | ||
| 223 | |||
| 224 | # | ||
| 225 | # SCTP Configuration (EXPERIMENTAL) | ||
| 226 | # | ||
| 227 | # CONFIG_IP_SCTP is not set | ||
| 228 | # CONFIG_ATM is not set | ||
| 229 | # CONFIG_VLAN_8021Q is not set | ||
| 230 | # CONFIG_LLC2 is not set | ||
| 231 | # CONFIG_IPX is not set | ||
| 232 | # CONFIG_ATALK is not set | ||
| 233 | # CONFIG_X25 is not set | ||
| 234 | # CONFIG_LAPB is not set | ||
| 235 | # CONFIG_NET_DIVERT is not set | ||
| 236 | # CONFIG_ECONET is not set | ||
| 237 | # CONFIG_WAN_ROUTER is not set | ||
| 238 | # CONFIG_NET_HW_FLOWCONTROL is not set | ||
| 239 | |||
| 240 | # | ||
| 241 | # QoS and/or fair queueing | ||
| 242 | # | ||
| 243 | # CONFIG_NET_SCHED is not set | ||
| 244 | |||
| 245 | # | ||
| 246 | # Network testing | ||
| 247 | # | ||
| 248 | # CONFIG_NET_PKTGEN is not set | ||
| 249 | CONFIG_NETDEVICES=y | ||
| 250 | |||
| 251 | # | ||
| 252 | # ARCnet devices | ||
| 253 | # | ||
| 254 | # CONFIG_ARCNET is not set | ||
| 255 | # CONFIG_DUMMY is not set | ||
| 256 | # CONFIG_BONDING is not set | ||
| 257 | # CONFIG_EQUALIZER is not set | ||
| 258 | # CONFIG_TUN is not set | ||
| 259 | |||
| 260 | # | ||
| 261 | # Ethernet (10 or 100Mbit) | ||
| 262 | # | ||
| 263 | # CONFIG_NET_ETHERNET is not set | ||
| 264 | |||
| 265 | # | ||
| 266 | # Ethernet (1000 Mbit) | ||
| 267 | # | ||
| 268 | # CONFIG_ACENIC is not set | ||
| 269 | # CONFIG_DL2K is not set | ||
| 270 | # CONFIG_E1000 is not set | ||
| 271 | # CONFIG_NS83820 is not set | ||
| 272 | # CONFIG_HAMACHI is not set | ||
| 273 | # CONFIG_YELLOWFIN is not set | ||
| 274 | # CONFIG_R8169 is not set | ||
| 275 | # CONFIG_SIS190 is not set | ||
| 276 | # CONFIG_SK98LIN is not set | ||
| 277 | # CONFIG_TIGON3 is not set | ||
| 278 | |||
| 279 | # | ||
| 280 | # Ethernet (10000 Mbit) | ||
| 281 | # | ||
| 282 | # CONFIG_IXGB is not set | ||
| 283 | CONFIG_IBM_EMAC=y | ||
| 284 | # CONFIG_IBM_EMAC_ERRMSG is not set | ||
| 285 | CONFIG_IBM_EMAC_RXB=64 | ||
| 286 | CONFIG_IBM_EMAC_TXB=8 | ||
| 287 | CONFIG_IBM_EMAC_FGAP=8 | ||
| 288 | CONFIG_IBM_EMAC_SKBRES=0 | ||
| 289 | # CONFIG_FDDI is not set | ||
| 290 | # CONFIG_HIPPI is not set | ||
| 291 | # CONFIG_PPP is not set | ||
| 292 | # CONFIG_SLIP is not set | ||
| 293 | |||
| 294 | # | ||
| 295 | # Wireless LAN (non-hamradio) | ||
| 296 | # | ||
| 297 | # CONFIG_NET_RADIO is not set | ||
| 298 | |||
| 299 | # | ||
| 300 | # Token Ring devices | ||
| 301 | # | ||
| 302 | # CONFIG_TR is not set | ||
| 303 | # CONFIG_RCPCI is not set | ||
| 304 | # CONFIG_SHAPER is not set | ||
| 305 | # CONFIG_NETCONSOLE is not set | ||
| 306 | |||
| 307 | # | ||
| 308 | # Wan interfaces | ||
| 309 | # | ||
| 310 | # CONFIG_WAN is not set | ||
| 311 | |||
| 312 | # | ||
| 313 | # Amateur Radio support | ||
| 314 | # | ||
| 315 | # CONFIG_HAMRADIO is not set | ||
| 316 | |||
| 317 | # | ||
| 318 | # IrDA (infrared) support | ||
| 319 | # | ||
| 320 | # CONFIG_IRDA is not set | ||
| 321 | |||
| 322 | # | ||
| 323 | # Bluetooth support | ||
| 324 | # | ||
| 325 | # CONFIG_BT is not set | ||
| 326 | # CONFIG_NETPOLL is not set | ||
| 327 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 328 | |||
| 329 | # | ||
| 330 | # ISDN subsystem | ||
| 331 | # | ||
| 332 | # CONFIG_ISDN is not set | ||
| 333 | |||
| 334 | # | ||
| 335 | # Telephony Support | ||
| 336 | # | ||
| 337 | # CONFIG_PHONE is not set | ||
| 338 | |||
| 339 | # | ||
| 340 | # Input device support | ||
| 341 | # | ||
| 342 | CONFIG_INPUT=y | ||
| 343 | |||
| 344 | # | ||
| 345 | # Userland interfaces | ||
| 346 | # | ||
| 347 | CONFIG_INPUT_MOUSEDEV=y | ||
| 348 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
| 349 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
| 350 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
| 351 | # CONFIG_INPUT_JOYDEV is not set | ||
| 352 | # CONFIG_INPUT_TSDEV is not set | ||
| 353 | # CONFIG_INPUT_EVDEV is not set | ||
| 354 | # CONFIG_INPUT_EVBUG is not set | ||
| 355 | |||
| 356 | # | ||
| 357 | # Input I/O drivers | ||
| 358 | # | ||
| 359 | # CONFIG_GAMEPORT is not set | ||
| 360 | CONFIG_SOUND_GAMEPORT=y | ||
| 361 | CONFIG_SERIO=y | ||
| 362 | CONFIG_SERIO_I8042=y | ||
| 363 | CONFIG_SERIO_SERPORT=y | ||
| 364 | # CONFIG_SERIO_CT82C710 is not set | ||
| 365 | # CONFIG_SERIO_PCIPS2 is not set | ||
| 366 | |||
| 367 | # | ||
| 368 | # Input Device Drivers | ||
| 369 | # | ||
| 370 | CONFIG_INPUT_KEYBOARD=y | ||
| 371 | CONFIG_KEYBOARD_ATKBD=y | ||
| 372 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
| 373 | # CONFIG_KEYBOARD_LKKBD is not set | ||
| 374 | # CONFIG_KEYBOARD_XTKBD is not set | ||
| 375 | # CONFIG_KEYBOARD_NEWTON is not set | ||
| 376 | CONFIG_INPUT_MOUSE=y | ||
| 377 | CONFIG_MOUSE_PS2=y | ||
| 378 | # CONFIG_MOUSE_SERIAL is not set | ||
| 379 | # CONFIG_MOUSE_VSXXXAA is not set | ||
| 380 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 381 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 382 | # CONFIG_INPUT_MISC is not set | ||
| 383 | |||
| 384 | # | ||
| 385 | # Character devices | ||
| 386 | # | ||
| 387 | # CONFIG_VT is not set | ||
| 388 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 389 | |||
| 390 | # | ||
| 391 | # Serial drivers | ||
| 392 | # | ||
| 393 | CONFIG_SERIAL_8250=y | ||
| 394 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 395 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
| 396 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
| 397 | |||
| 398 | # | ||
| 399 | # Non-8250 serial port support | ||
| 400 | # | ||
| 401 | CONFIG_SERIAL_CORE=y | ||
| 402 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 403 | CONFIG_UNIX98_PTYS=y | ||
| 404 | CONFIG_LEGACY_PTYS=y | ||
| 405 | CONFIG_LEGACY_PTY_COUNT=256 | ||
| 406 | # CONFIG_QIC02_TAPE is not set | ||
| 407 | |||
| 408 | # | ||
| 409 | # IPMI | ||
| 410 | # | ||
| 411 | # CONFIG_IPMI_HANDLER is not set | ||
| 412 | |||
| 413 | # | ||
| 414 | # Watchdog Cards | ||
| 415 | # | ||
| 416 | CONFIG_WATCHDOG=y | ||
| 417 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 418 | |||
| 419 | # | ||
| 420 | # Watchdog Device Drivers | ||
| 421 | # | ||
| 422 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 423 | |||
| 424 | # | ||
| 425 | # PCI-based Watchdog Cards | ||
| 426 | # | ||
| 427 | # CONFIG_PCIPCWATCHDOG is not set | ||
| 428 | # CONFIG_WDTPCI is not set | ||
| 429 | # CONFIG_NVRAM is not set | ||
| 430 | CONFIG_GEN_RTC=y | ||
| 431 | # CONFIG_GEN_RTC_X is not set | ||
| 432 | # CONFIG_DTLK is not set | ||
| 433 | # CONFIG_R3964 is not set | ||
| 434 | # CONFIG_APPLICOM is not set | ||
| 435 | |||
| 436 | # | ||
| 437 | # Ftape, the floppy tape device driver | ||
| 438 | # | ||
| 439 | # CONFIG_FTAPE is not set | ||
| 440 | # CONFIG_AGP is not set | ||
| 441 | # CONFIG_DRM is not set | ||
| 442 | # CONFIG_RAW_DRIVER is not set | ||
| 443 | |||
| 444 | # | ||
| 445 | # I2C support | ||
| 446 | # | ||
| 447 | CONFIG_I2C=y | ||
| 448 | # CONFIG_I2C_CHARDEV is not set | ||
| 449 | |||
| 450 | # | ||
| 451 | # I2C Algorithms | ||
| 452 | # | ||
| 453 | # CONFIG_I2C_ALGOBIT is not set | ||
| 454 | # CONFIG_I2C_ALGOPCF is not set | ||
| 455 | |||
| 456 | # | ||
| 457 | # I2C Hardware Bus support | ||
| 458 | # | ||
| 459 | # CONFIG_I2C_ALI1535 is not set | ||
| 460 | # CONFIG_I2C_ALI15X3 is not set | ||
| 461 | # CONFIG_I2C_AMD756 is not set | ||
| 462 | # CONFIG_I2C_AMD8111 is not set | ||
| 463 | # CONFIG_I2C_I801 is not set | ||
| 464 | # CONFIG_I2C_I810 is not set | ||
| 465 | # CONFIG_I2C_IBM_IIC is not set | ||
| 466 | # CONFIG_I2C_ISA is not set | ||
| 467 | # CONFIG_I2C_NFORCE2 is not set | ||
| 468 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 469 | # CONFIG_I2C_PIIX4 is not set | ||
| 470 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 471 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 472 | # CONFIG_SCx200_ACB is not set | ||
| 473 | # CONFIG_I2C_SIS5595 is not set | ||
| 474 | # CONFIG_I2C_SIS630 is not set | ||
| 475 | # CONFIG_I2C_SIS96X is not set | ||
| 476 | # CONFIG_I2C_VIA is not set | ||
| 477 | # CONFIG_I2C_VIAPRO is not set | ||
| 478 | # CONFIG_I2C_VOODOO3 is not set | ||
| 479 | |||
| 480 | # | ||
| 481 | # Hardware Sensors Chip support | ||
| 482 | # | ||
| 483 | # CONFIG_I2C_SENSOR is not set | ||
| 484 | # CONFIG_SENSORS_ADM1021 is not set | ||
| 485 | # CONFIG_SENSORS_ASB100 is not set | ||
| 486 | # CONFIG_SENSORS_DS1621 is not set | ||
| 487 | # CONFIG_SENSORS_FSCHER is not set | ||
| 488 | # CONFIG_SENSORS_GL518SM is not set | ||
| 489 | # CONFIG_SENSORS_IT87 is not set | ||
| 490 | # CONFIG_SENSORS_LM75 is not set | ||
| 491 | # CONFIG_SENSORS_LM78 is not set | ||
| 492 | # CONFIG_SENSORS_LM80 is not set | ||
| 493 | # CONFIG_SENSORS_LM83 is not set | ||
| 494 | # CONFIG_SENSORS_LM85 is not set | ||
| 495 | # CONFIG_SENSORS_LM90 is not set | ||
| 496 | # CONFIG_SENSORS_VIA686A is not set | ||
| 497 | # CONFIG_SENSORS_W83781D is not set | ||
| 498 | # CONFIG_SENSORS_W83L785TS is not set | ||
| 499 | # CONFIG_SENSORS_W83627HF is not set | ||
| 500 | |||
| 501 | # | ||
| 502 | # Other I2C Chip support | ||
| 503 | # | ||
| 504 | # CONFIG_SENSORS_EEPROM is not set | ||
| 505 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 506 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 507 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 508 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 509 | |||
| 510 | # | ||
| 511 | # Misc devices | ||
| 512 | # | ||
| 513 | |||
| 514 | # | ||
| 515 | # Multimedia devices | ||
| 516 | # | ||
| 517 | # CONFIG_VIDEO_DEV is not set | ||
| 518 | |||
| 519 | # | ||
| 520 | # Digital Video Broadcasting Devices | ||
| 521 | # | ||
| 522 | # CONFIG_DVB is not set | ||
| 523 | |||
| 524 | # | ||
| 525 | # Graphics support | ||
| 526 | # | ||
| 527 | # CONFIG_FB is not set | ||
| 528 | |||
| 529 | # | ||
| 530 | # Sound | ||
| 531 | # | ||
| 532 | # CONFIG_SOUND is not set | ||
| 533 | |||
| 534 | # | ||
| 535 | # USB support | ||
| 536 | # | ||
| 537 | # CONFIG_USB is not set | ||
| 538 | |||
| 539 | # | ||
| 540 | # USB Gadget Support | ||
| 541 | # | ||
| 542 | # CONFIG_USB_GADGET is not set | ||
| 543 | |||
| 544 | # | ||
| 545 | # File systems | ||
| 546 | # | ||
| 547 | CONFIG_EXT2_FS=y | ||
| 548 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 549 | # CONFIG_EXT3_FS is not set | ||
| 550 | # CONFIG_JBD is not set | ||
| 551 | # CONFIG_REISERFS_FS is not set | ||
| 552 | # CONFIG_JFS_FS is not set | ||
| 553 | # CONFIG_XFS_FS is not set | ||
| 554 | # CONFIG_MINIX_FS is not set | ||
| 555 | # CONFIG_ROMFS_FS is not set | ||
| 556 | # CONFIG_QUOTA is not set | ||
| 557 | # CONFIG_AUTOFS_FS is not set | ||
| 558 | # CONFIG_AUTOFS4_FS is not set | ||
| 559 | |||
| 560 | # | ||
| 561 | # CD-ROM/DVD Filesystems | ||
| 562 | # | ||
| 563 | # CONFIG_ISO9660_FS is not set | ||
| 564 | # CONFIG_UDF_FS is not set | ||
| 565 | |||
| 566 | # | ||
| 567 | # DOS/FAT/NT Filesystems | ||
| 568 | # | ||
| 569 | # CONFIG_FAT_FS is not set | ||
| 570 | # CONFIG_NTFS_FS is not set | ||
| 571 | |||
| 572 | # | ||
| 573 | # Pseudo filesystems | ||
| 574 | # | ||
| 575 | CONFIG_PROC_FS=y | ||
| 576 | CONFIG_PROC_KCORE=y | ||
| 577 | # CONFIG_DEVFS_FS is not set | ||
| 578 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
| 579 | CONFIG_TMPFS=y | ||
| 580 | # CONFIG_HUGETLB_PAGE is not set | ||
| 581 | CONFIG_RAMFS=y | ||
| 582 | |||
| 583 | # | ||
| 584 | # Miscellaneous filesystems | ||
| 585 | # | ||
| 586 | # CONFIG_ADFS_FS is not set | ||
| 587 | # CONFIG_AFFS_FS is not set | ||
| 588 | # CONFIG_HFS_FS is not set | ||
| 589 | # CONFIG_HFSPLUS_FS is not set | ||
| 590 | # CONFIG_BEFS_FS is not set | ||
| 591 | # CONFIG_BFS_FS is not set | ||
| 592 | # CONFIG_EFS_FS is not set | ||
| 593 | # CONFIG_CRAMFS is not set | ||
| 594 | # CONFIG_VXFS_FS is not set | ||
| 595 | # CONFIG_HPFS_FS is not set | ||
| 596 | # CONFIG_QNX4FS_FS is not set | ||
| 597 | # CONFIG_SYSV_FS is not set | ||
| 598 | # CONFIG_UFS_FS is not set | ||
| 599 | |||
| 600 | # | ||
| 601 | # Network File Systems | ||
| 602 | # | ||
| 603 | CONFIG_NFS_FS=y | ||
| 604 | # CONFIG_NFS_V3 is not set | ||
| 605 | # CONFIG_NFS_V4 is not set | ||
| 606 | # CONFIG_NFS_DIRECTIO is not set | ||
| 607 | # CONFIG_NFSD is not set | ||
| 608 | CONFIG_ROOT_NFS=y | ||
| 609 | CONFIG_LOCKD=y | ||
| 610 | # CONFIG_EXPORTFS is not set | ||
| 611 | CONFIG_SUNRPC=y | ||
| 612 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 613 | # CONFIG_SMB_FS is not set | ||
| 614 | # CONFIG_CIFS is not set | ||
| 615 | # CONFIG_NCP_FS is not set | ||
| 616 | # CONFIG_CODA_FS is not set | ||
| 617 | # CONFIG_INTERMEZZO_FS is not set | ||
| 618 | # CONFIG_AFS_FS is not set | ||
| 619 | |||
| 620 | # | ||
| 621 | # Partition Types | ||
| 622 | # | ||
| 623 | CONFIG_PARTITION_ADVANCED=y | ||
| 624 | # CONFIG_ACORN_PARTITION is not set | ||
| 625 | # CONFIG_OSF_PARTITION is not set | ||
| 626 | # CONFIG_AMIGA_PARTITION is not set | ||
| 627 | # CONFIG_ATARI_PARTITION is not set | ||
| 628 | # CONFIG_MAC_PARTITION is not set | ||
| 629 | # CONFIG_MSDOS_PARTITION is not set | ||
| 630 | # CONFIG_LDM_PARTITION is not set | ||
| 631 | # CONFIG_NEC98_PARTITION is not set | ||
| 632 | # CONFIG_SGI_PARTITION is not set | ||
| 633 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 634 | # CONFIG_SUN_PARTITION is not set | ||
| 635 | # CONFIG_EFI_PARTITION is not set | ||
| 636 | |||
| 637 | # | ||
| 638 | # Native Language Support | ||
| 639 | # | ||
| 640 | # CONFIG_NLS is not set | ||
| 641 | |||
| 642 | # | ||
| 643 | # IBM 40x options | ||
| 644 | # | ||
| 645 | |||
| 646 | # | ||
| 647 | # Library routines | ||
| 648 | # | ||
| 649 | CONFIG_CRC32=y | ||
| 650 | |||
| 651 | # | ||
| 652 | # Kernel hacking | ||
| 653 | # | ||
| 654 | # CONFIG_DEBUG_KERNEL is not set | ||
| 655 | # CONFIG_SERIAL_TEXT_DEBUG is not set | ||
| 656 | CONFIG_OCP=y | ||
| 657 | |||
| 658 | # | ||
| 659 | # Security options | ||
| 660 | # | ||
| 661 | # CONFIG_SECURITY is not set | ||
| 662 | |||
| 663 | # | ||
| 664 | # Cryptographic options | ||
| 665 | # | ||
| 666 | # CONFIG_CRYPTO is not set | ||
diff --git a/arch/ppc/platforms/4xx/Kconfig b/arch/ppc/platforms/4xx/Kconfig index 805dd98908a3..a7eaba91dfbf 100644 --- a/arch/ppc/platforms/4xx/Kconfig +++ b/arch/ppc/platforms/4xx/Kconfig | |||
| @@ -16,11 +16,6 @@ choice | |||
| 16 | depends on 40x | 16 | depends on 40x |
| 17 | default WALNUT | 17 | default WALNUT |
| 18 | 18 | ||
| 19 | config ASH | ||
| 20 | bool "Ash" | ||
| 21 | help | ||
| 22 | This option enables support for the IBM NP405H evaluation board. | ||
| 23 | |||
| 24 | config BUBINGA | 19 | config BUBINGA |
| 25 | bool "Bubinga" | 20 | bool "Bubinga" |
| 26 | select WANT_EARLY_SERIAL | 21 | select WANT_EARLY_SERIAL |
diff --git a/arch/ppc/platforms/4xx/Makefile b/arch/ppc/platforms/4xx/Makefile index 844c3b5066e8..f00e0d02ee2c 100644 --- a/arch/ppc/platforms/4xx/Makefile +++ b/arch/ppc/platforms/4xx/Makefile | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | # | 1 | # |
| 2 | # Makefile for the PowerPC 4xx linux kernel. | 2 | # Makefile for the PowerPC 4xx linux kernel. |
| 3 | 3 | ||
| 4 | obj-$(CONFIG_ASH) += ash.o | ||
| 5 | obj-$(CONFIG_BAMBOO) += bamboo.o | 4 | obj-$(CONFIG_BAMBOO) += bamboo.o |
| 6 | obj-$(CONFIG_CPCI405) += cpci405.o | 5 | obj-$(CONFIG_CPCI405) += cpci405.o |
| 7 | obj-$(CONFIG_EBONY) += ebony.o | 6 | obj-$(CONFIG_EBONY) += ebony.o |
diff --git a/arch/ppc/platforms/4xx/ash.c b/arch/ppc/platforms/4xx/ash.c deleted file mode 100644 index ce2911793716..000000000000 --- a/arch/ppc/platforms/4xx/ash.c +++ /dev/null | |||
| @@ -1,250 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/ppc/platforms/4xx/ash.c | ||
| 3 | * | ||
| 4 | * Support for the IBM NP405H ash eval board | ||
| 5 | * | ||
| 6 | * Author: Armin Kuster <akuster@mvista.com> | ||
| 7 | * | ||
| 8 | * 2001-2002 (c) MontaVista, Software, Inc. This file is licensed under | ||
| 9 | * the terms of the GNU General Public License version 2. This program | ||
| 10 | * is licensed "as is" without any warranty of any kind, whether express | ||
| 11 | * or implied. | ||
| 12 | */ | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/init.h> | ||
| 15 | #include <linux/pagemap.h> | ||
| 16 | #include <linux/pci.h> | ||
| 17 | |||
| 18 | #include <asm/machdep.h> | ||
| 19 | #include <asm/pci-bridge.h> | ||
| 20 | #include <asm/io.h> | ||
| 21 | #include <asm/ocp.h> | ||
| 22 | #include <asm/ibm_ocp_pci.h> | ||
| 23 | #include <asm/todc.h> | ||
| 24 | |||
| 25 | #ifdef DEBUG | ||
| 26 | #define DBG(x...) printk(x) | ||
| 27 | #else | ||
| 28 | #define DBG(x...) | ||
| 29 | #endif | ||
| 30 | |||
| 31 | void *ash_rtc_base; | ||
| 32 | |||
| 33 | /* Some IRQs unique to Walnut. | ||
| 34 | * Used by the generic 405 PCI setup functions in ppc4xx_pci.c | ||
| 35 | */ | ||
| 36 | int __init | ||
| 37 | ppc405_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin) | ||
| 38 | { | ||
| 39 | static char pci_irq_table[][4] = | ||
| 40 | /* | ||
| 41 | * PCI IDSEL/INTPIN->INTLINE | ||
| 42 | * A B C D | ||
| 43 | */ | ||
| 44 | { | ||
| 45 | {24, 24, 24, 24}, /* IDSEL 1 - PCI slot 1 */ | ||
| 46 | {25, 25, 25, 25}, /* IDSEL 2 - PCI slot 2 */ | ||
| 47 | {26, 26, 26, 26}, /* IDSEL 3 - PCI slot 3 */ | ||
| 48 | {27, 27, 27, 27}, /* IDSEL 4 - PCI slot 4 */ | ||
| 49 | }; | ||
| 50 | |||
| 51 | const long min_idsel = 1, max_idsel = 4, irqs_per_slot = 4; | ||
| 52 | return PCI_IRQ_TABLE_LOOKUP; | ||
| 53 | } | ||
| 54 | |||
| 55 | void __init | ||
| 56 | ash_setup_arch(void) | ||
| 57 | { | ||
| 58 | ppc4xx_setup_arch(); | ||
| 59 | |||
| 60 | ibm_ocp_set_emac(0, 3); | ||
| 61 | |||
| 62 | #ifdef CONFIG_DEBUG_BRINGUP | ||
| 63 | int i; | ||
| 64 | printk("\n"); | ||
| 65 | printk("machine\t: %s\n", PPC4xx_MACHINE_NAME); | ||
| 66 | printk("\n"); | ||
| 67 | printk("bi_s_version\t %s\n", bip->bi_s_version); | ||
| 68 | printk("bi_r_version\t %s\n", bip->bi_r_version); | ||
| 69 | printk("bi_memsize\t 0x%8.8x\t %dMBytes\n", bip->bi_memsize, | ||
| 70 | bip->bi_memsize / (1024 * 1000)); | ||
| 71 | for (i = 0; i < EMAC_NUMS; i++) { | ||
| 72 | printk("bi_enetaddr %d\t %2.2x%2.2x%2.2x-%2.2x%2.2x%2.2x\n", i, | ||
| 73 | bip->bi_enetaddr[i][0], bip->bi_enetaddr[i][1], | ||
| 74 | bip->bi_enetaddr[i][2], bip->bi_enetaddr[i][3], | ||
| 75 | bip->bi_enetaddr[i][4], bip->bi_enetaddr[i][5]); | ||
| 76 | } | ||
| 77 | printk("bi_pci_enetaddr %d\t %2.2x%2.2x%2.2x-%2.2x%2.2x%2.2x\n", 0, | ||
| 78 | bip->bi_pci_enetaddr[0], bip->bi_pci_enetaddr[1], | ||
| 79 | bip->bi_pci_enetaddr[2], bip->bi_pci_enetaddr[3], | ||
| 80 | bip->bi_pci_enetaddr[4], bip->bi_pci_enetaddr[5]); | ||
| 81 | |||
| 82 | printk("bi_intfreq\t 0x%8.8x\t clock:\t %dMhz\n", | ||
| 83 | bip->bi_intfreq, bip->bi_intfreq / 1000000); | ||
| 84 | |||
| 85 | printk("bi_busfreq\t 0x%8.8x\t plb bus clock:\t %dMHz\n", | ||
| 86 | bip->bi_busfreq, bip->bi_busfreq / 1000000); | ||
| 87 | printk("bi_pci_busfreq\t 0x%8.8x\t pci bus clock:\t %dMHz\n", | ||
| 88 | bip->bi_pci_busfreq, bip->bi_pci_busfreq / 1000000); | ||
| 89 | |||
| 90 | printk("\n"); | ||
| 91 | #endif | ||
| 92 | /* RTC step for ash */ | ||
| 93 | ash_rtc_base = (void *) ASH_RTC_VADDR; | ||
| 94 | TODC_INIT(TODC_TYPE_DS1743, ash_rtc_base, ash_rtc_base, ash_rtc_base, | ||
| 95 | 8); | ||
| 96 | } | ||
| 97 | |||
| 98 | void __init | ||
| 99 | bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip) | ||
| 100 | { | ||
| 101 | /* | ||
| 102 | * Expected PCI mapping: | ||
| 103 | * | ||
| 104 | * PLB addr PCI memory addr | ||
| 105 | * --------------------- --------------------- | ||
| 106 | * 0000'0000 - 7fff'ffff <--- 0000'0000 - 7fff'ffff | ||
| 107 | * 8000'0000 - Bfff'ffff ---> 8000'0000 - Bfff'ffff | ||
| 108 | * | ||
| 109 | * PLB addr PCI io addr | ||
| 110 | * --------------------- --------------------- | ||
| 111 | * e800'0000 - e800'ffff ---> 0000'0000 - 0001'0000 | ||
| 112 | * | ||
| 113 | * The following code is simplified by assuming that the bootrom | ||
| 114 | * has been well behaved in following this mapping. | ||
| 115 | */ | ||
| 116 | |||
| 117 | #ifdef DEBUG | ||
| 118 | int i; | ||
| 119 | |||
| 120 | printk("ioremap PCLIO_BASE = 0x%x\n", pcip); | ||
| 121 | printk("PCI bridge regs before fixup \n"); | ||
| 122 | for (i = 0; i <= 2; i++) { | ||
| 123 | printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].ma))); | ||
| 124 | printk(" pmm%dla\t0x%x\n", i, in_le32(&(pcip->pmm[i].la))); | ||
| 125 | printk(" pmm%dpcila\t0x%x\n", i, | ||
| 126 | in_le32(&(pcip->pmm[i].pcila))); | ||
| 127 | printk(" pmm%dpciha\t0x%x\n", i, | ||
| 128 | in_le32(&(pcip->pmm[i].pciha))); | ||
| 129 | } | ||
| 130 | printk(" ptm1ms\t0x%x\n", in_le32(&(pcip->ptm1ms))); | ||
| 131 | printk(" ptm1la\t0x%x\n", in_le32(&(pcip->ptm1la))); | ||
| 132 | printk(" ptm2ms\t0x%x\n", in_le32(&(pcip->ptm2ms))); | ||
| 133 | printk(" ptm2la\t0x%x\n", in_le32(&(pcip->ptm2la))); | ||
| 134 | for (bar = PCI_BASE_ADDRESS_1; bar <= PCI_BASE_ADDRESS_2; bar += 4) { | ||
| 135 | early_read_config_dword(hose, hose->first_busno, | ||
| 136 | PCI_FUNC(hose->first_busno), bar, | ||
| 137 | &bar_response); | ||
| 138 | DBG("BUS %d, device %d, Function %d bar 0x%8.8x is 0x%8.8x\n", | ||
| 139 | hose->first_busno, PCI_SLOT(hose->first_busno), | ||
| 140 | PCI_FUNC(hose->first_busno), bar, bar_response); | ||
| 141 | } | ||
| 142 | |||
| 143 | #endif | ||
| 144 | if (ppc_md.progress) | ||
| 145 | ppc_md.progress("bios_fixup(): enter", 0x800); | ||
| 146 | |||
| 147 | /* added for IBM boot rom version 1.15 bios bar changes -AK */ | ||
| 148 | |||
| 149 | /* Disable region first */ | ||
| 150 | out_le32((void *) &(pcip->pmm[0].ma), 0x00000000); | ||
| 151 | /* PLB starting addr, PCI: 0x80000000 */ | ||
| 152 | out_le32((void *) &(pcip->pmm[0].la), 0x80000000); | ||
| 153 | /* PCI start addr, 0x80000000 */ | ||
| 154 | out_le32((void *) &(pcip->pmm[0].pcila), PPC405_PCI_MEM_BASE); | ||
| 155 | /* 512MB range of PLB to PCI */ | ||
| 156 | out_le32((void *) &(pcip->pmm[0].pciha), 0x00000000); | ||
| 157 | /* Enable no pre-fetch, enable region */ | ||
| 158 | out_le32((void *) &(pcip->pmm[0].ma), ((0xffffffff - | ||
| 159 | (PPC405_PCI_UPPER_MEM - | ||
| 160 | PPC405_PCI_MEM_BASE)) | 0x01)); | ||
| 161 | |||
| 162 | /* Disable region one */ | ||
| 163 | out_le32((void *) &(pcip->pmm[1].ma), 0x00000000); | ||
| 164 | out_le32((void *) &(pcip->pmm[1].la), 0x00000000); | ||
| 165 | out_le32((void *) &(pcip->pmm[1].pcila), 0x00000000); | ||
| 166 | out_le32((void *) &(pcip->pmm[1].pciha), 0x00000000); | ||
| 167 | out_le32((void *) &(pcip->pmm[1].ma), 0x00000000); | ||
| 168 | |||
| 169 | /* Disable region two */ | ||
| 170 | out_le32((void *) &(pcip->pmm[2].ma), 0x00000000); | ||
| 171 | out_le32((void *) &(pcip->pmm[2].la), 0x00000000); | ||
| 172 | out_le32((void *) &(pcip->pmm[2].pcila), 0x00000000); | ||
| 173 | out_le32((void *) &(pcip->pmm[2].pciha), 0x00000000); | ||
| 174 | out_le32((void *) &(pcip->pmm[2].ma), 0x00000000); | ||
| 175 | |||
| 176 | /* Enable PTM1 and PTM2, mapped to PLB address 0. */ | ||
| 177 | |||
| 178 | out_le32((void *) &(pcip->ptm1la), 0x00000000); | ||
| 179 | out_le32((void *) &(pcip->ptm1ms), 0x00000001); | ||
| 180 | out_le32((void *) &(pcip->ptm2la), 0x00000000); | ||
| 181 | out_le32((void *) &(pcip->ptm2ms), 0x00000001); | ||
| 182 | |||
| 183 | /* Write zero to PTM1 BAR. */ | ||
| 184 | |||
| 185 | early_write_config_dword(hose, hose->first_busno, | ||
| 186 | PCI_FUNC(hose->first_busno), | ||
| 187 | PCI_BASE_ADDRESS_1, | ||
| 188 | 0x00000000); | ||
| 189 | |||
| 190 | /* Disable PTM2 (unused) */ | ||
| 191 | |||
| 192 | out_le32((void *) &(pcip->ptm2la), 0x00000000); | ||
| 193 | out_le32((void *) &(pcip->ptm2ms), 0x00000000); | ||
| 194 | |||
| 195 | /* end work arround */ | ||
| 196 | if (ppc_md.progress) | ||
| 197 | ppc_md.progress("bios_fixup(): done", 0x800); | ||
| 198 | |||
| 199 | #ifdef DEBUG | ||
| 200 | printk("PCI bridge regs after fixup \n"); | ||
| 201 | for (i = 0; i <= 2; i++) { | ||
| 202 | printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].ma))); | ||
| 203 | printk(" pmm%dla\t0x%x\n", i, in_le32(&(pcip->pmm[i].la))); | ||
| 204 | printk(" pmm%dpcila\t0x%x\n", i, | ||
| 205 | in_le32(&(pcip->pmm[i].pcila))); | ||
| 206 | printk(" pmm%dpciha\t0x%x\n", i, | ||
| 207 | in_le32(&(pcip->pmm[i].pciha))); | ||
| 208 | } | ||
| 209 | printk(" ptm1ms\t0x%x\n", in_le32(&(pcip->ptm1ms))); | ||
| 210 | printk(" ptm1la\t0x%x\n", in_le32(&(pcip->ptm1la))); | ||
| 211 | printk(" ptm2ms\t0x%x\n", in_le32(&(pcip->ptm2ms))); | ||
| 212 | printk(" ptm2la\t0x%x\n", in_le32(&(pcip->ptm2la))); | ||
| 213 | |||
| 214 | for (bar = PCI_BASE_ADDRESS_1; bar <= PCI_BASE_ADDRESS_2; bar += 4) { | ||
| 215 | early_read_config_dword(hose, hose->first_busno, | ||
| 216 | PCI_FUNC(hose->first_busno), bar, | ||
| 217 | &bar_response); | ||
| 218 | DBG("BUS %d, device %d, Function %d bar 0x%8.8x is 0x%8.8x\n", | ||
| 219 | hose->first_busno, PCI_SLOT(hose->first_busno), | ||
| 220 | PCI_FUNC(hose->first_busno), bar, bar_response); | ||
| 221 | } | ||
| 222 | |||
| 223 | |||
| 224 | #endif | ||
| 225 | } | ||
| 226 | |||
| 227 | void __init | ||
| 228 | ash_map_io(void) | ||
| 229 | { | ||
| 230 | ppc4xx_map_io(); | ||
| 231 | io_block_mapping(ASH_RTC_VADDR, ASH_RTC_PADDR, ASH_RTC_SIZE, _PAGE_IO); | ||
| 232 | } | ||
| 233 | |||
| 234 | void __init | ||
| 235 | platform_init(unsigned long r3, unsigned long r4, unsigned long r5, | ||
| 236 | unsigned long r6, unsigned long r7) | ||
| 237 | { | ||
| 238 | ppc4xx_init(r3, r4, r5, r6, r7); | ||
| 239 | |||
| 240 | ppc_md.setup_arch = ash_setup_arch; | ||
| 241 | ppc_md.setup_io_mappings = ash_map_io; | ||
| 242 | |||
| 243 | #ifdef CONFIG_PPC_RTC | ||
| 244 | ppc_md.time_init = todc_time_init; | ||
| 245 | ppc_md.set_rtc_time = todc_set_rtc_time; | ||
| 246 | ppc_md.get_rtc_time = todc_get_rtc_time; | ||
| 247 | ppc_md.nvram_read_val = todc_direct_read_val; | ||
| 248 | ppc_md.nvram_write_val = todc_direct_write_val; | ||
| 249 | #endif | ||
| 250 | } | ||
diff --git a/arch/ppc/platforms/4xx/ash.h b/arch/ppc/platforms/4xx/ash.h deleted file mode 100644 index 5f7448ea418d..000000000000 --- a/arch/ppc/platforms/4xx/ash.h +++ /dev/null | |||
| @@ -1,83 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/ppc/platforms/4xx/ash.h | ||
| 3 | * | ||
| 4 | * Macros, definitions, and data structures specific to the IBM PowerPC | ||
| 5 | * Ash eval board. | ||
| 6 | * | ||
| 7 | * Author: Armin Kuster <akuster@mvista.com> | ||
| 8 | * | ||
| 9 | * 2000-2002 (c) MontaVista, Software, Inc. This file is licensed under | ||
| 10 | * the terms of the GNU General Public License version 2. This program | ||
| 11 | * is licensed "as is" without any warranty of any kind, whether express | ||
| 12 | * or implied. | ||
| 13 | */ | ||
| 14 | |||
| 15 | #ifdef __KERNEL__ | ||
| 16 | #ifndef __ASM_ASH_H__ | ||
| 17 | #define __ASM_ASH_H__ | ||
| 18 | #include <platforms/4xx/ibmnp405h.h> | ||
| 19 | |||
| 20 | #ifndef __ASSEMBLY__ | ||
| 21 | /* | ||
| 22 | * Data structure defining board information maintained by the boot | ||
| 23 | * ROM on IBM's "Ash" evaluation board. An effort has been made to | ||
| 24 | * keep the field names consistent with the 8xx 'bd_t' board info | ||
| 25 | * structures. | ||
| 26 | */ | ||
| 27 | |||
| 28 | typedef struct board_info { | ||
| 29 | unsigned char bi_s_version[4]; /* Version of this structure */ | ||
| 30 | unsigned char bi_r_version[30]; /* Version of the IBM ROM */ | ||
| 31 | unsigned int bi_memsize; /* DRAM installed, in bytes */ | ||
| 32 | unsigned char bi_enetaddr[4][6]; /* Local Ethernet MAC address */ | ||
| 33 | unsigned char bi_pci_enetaddr[6]; | ||
| 34 | unsigned int bi_intfreq; /* Processor speed, in Hz */ | ||
| 35 | unsigned int bi_busfreq; /* PLB Bus speed, in Hz */ | ||
| 36 | unsigned int bi_pci_busfreq; /* PCI speed in Hz */ | ||
| 37 | } bd_t; | ||
| 38 | |||
| 39 | /* Some 4xx parts use a different timebase frequency from the internal clock. | ||
| 40 | */ | ||
| 41 | #define bi_tbfreq bi_intfreq | ||
| 42 | |||
| 43 | /* Memory map for the IBM "Ash" NP405H evaluation board. | ||
| 44 | */ | ||
| 45 | |||
| 46 | extern void *ash_rtc_base; | ||
| 47 | #define ASH_RTC_PADDR ((uint)0xf0000000) | ||
| 48 | #define ASH_RTC_VADDR ASH_RTC_PADDR | ||
| 49 | #define ASH_RTC_SIZE ((uint)8*1024) | ||
| 50 | |||
| 51 | |||
| 52 | /* Early initialization address mapping for block_io. | ||
| 53 | * Standard 405GP map. | ||
| 54 | */ | ||
| 55 | #define PPC4xx_PCI_IO_PADDR ((uint)PPC405_PCI_PHY_IO_BASE) | ||
| 56 | #define PPC4xx_PCI_IO_VADDR PPC4xx_PCI_IO_PADDR | ||
| 57 | #define PPC4xx_PCI_IO_SIZE ((uint)64*1024) | ||
| 58 | #define PPC4xx_PCI_CFG_PADDR ((uint)PPC405_PCI_CONFIG_ADDR) | ||
| 59 | #define PPC4xx_PCI_CFG_VADDR PPC4xx_PCI_CFG_PADDR | ||
| 60 | #define PPC4xx_PCI_CFG_SIZE ((uint)4*1024) | ||
| 61 | #define PPC4xx_PCI_LCFG_PADDR ((uint)0xef400000) | ||
| 62 | #define PPC4xx_PCI_LCFG_VADDR PPC4xx_PCI_LCFG_PADDR | ||
| 63 | #define PPC4xx_PCI_LCFG_SIZE ((uint)4*1024) | ||
| 64 | #define PPC4xx_ONB_IO_PADDR ((uint)0xef600000) | ||
| 65 | #define PPC4xx_ONB_IO_VADDR PPC4xx_ONB_IO_PADDR | ||
| 66 | #define PPC4xx_ONB_IO_SIZE ((uint)4*1024) | ||
| 67 | |||
| 68 | #define NR_BOARD_IRQS 32 | ||
| 69 | |||
| 70 | #ifdef CONFIG_PPC405GP_INTERNAL_CLOCK | ||
| 71 | #define BASE_BAUD 201600 | ||
| 72 | #else | ||
| 73 | #define BASE_BAUD 691200 | ||
| 74 | #endif | ||
| 75 | |||
| 76 | #define PPC4xx_MACHINE_NAME "IBM NP405H Ash" | ||
| 77 | |||
| 78 | extern char pci_irq_table[][4]; | ||
| 79 | |||
| 80 | |||
| 81 | #endif /* !__ASSEMBLY__ */ | ||
| 82 | #endif /* __ASM_ASH_H__ */ | ||
| 83 | #endif /* __KERNEL__ */ | ||
diff --git a/arch/ppc/syslib/ppc4xx_setup.c b/arch/ppc/syslib/ppc4xx_setup.c index e170aebeb69b..795b966e696a 100644 --- a/arch/ppc/syslib/ppc4xx_setup.c +++ b/arch/ppc/syslib/ppc4xx_setup.c | |||
| @@ -171,7 +171,7 @@ ppc4xx_calibrate_decr(void) | |||
| 171 | unsigned int freq; | 171 | unsigned int freq; |
| 172 | bd_t *bip = &__res; | 172 | bd_t *bip = &__res; |
| 173 | 173 | ||
| 174 | #if defined(CONFIG_WALNUT) || defined(CONFIG_ASH) || defined(CONFIG_SYCAMORE) | 174 | #if defined(CONFIG_WALNUT) || defined(CONFIG_SYCAMORE) |
| 175 | /* Walnut boot rom sets DCR CHCR1 (aka CPC0_CR1) bit CETE to 1 */ | 175 | /* Walnut boot rom sets DCR CHCR1 (aka CPC0_CR1) bit CETE to 1 */ |
| 176 | mtdcr(DCRN_CHCR1, mfdcr(DCRN_CHCR1) & ~CHR1_CETE); | 176 | mtdcr(DCRN_CHCR1, mfdcr(DCRN_CHCR1) & ~CHR1_CETE); |
| 177 | #endif | 177 | #endif |
