minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 12:39:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

ppc4xx: Consolidate PPC4xx UIC defines

Browse Source 
This patch is the first step to consolidate the UIC related defines in the
4xx headers. Move header from asm-ppc/ppc4xx-intvec.h to
asm-ppc/ppc4xx-uic.h as it will hold all UIC related defines in the next
steps.

Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Stefan Roese 2008-06-25 10:59:22 +02:00
parent 7ee2619c20
commit 4fb25a3db3
8 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
board/amcc/sequoia/sequoia.c
View File

@ -25,12 +25,11 @@
#include <common.h> #include <common.h>
#include <libfdt.h> #include <libfdt.h>
#include <fdt_support.h> #include <fdt_support.h>
#include <ppc440.h> #include <ppc4xx.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/bitops.h> #include <asm/bitops.h>
#include <asm/ppc4xx-intvec.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;

1
cpu/ppc4xx/4xx_enet.c
View File

@ -90,7 +90,6 @@
#include <405_mal.h> #include <405_mal.h>
#include <miiphy.h> #include <miiphy.h>
#include <malloc.h> #include <malloc.h>
#include <asm/ppc4xx-intvec.h>
/* /*
* Only compile for platform with AMCC EMAC ethernet controller and * Only compile for platform with AMCC EMAC ethernet controller and

2
cpu/ppc4xx/4xx_uart.c
View File

@ -46,7 +46,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/io.h> #include <asm/io.h>
#include <watchdog.h> #include <watchdog.h>
#include <asm/ppc4xx-intvec.h> #include <ppc4xx.h>
#ifdef CONFIG_SERIAL_MULTI #ifdef CONFIG_SERIAL_MULTI
#include <serial.h> #include <serial.h>

1
cpu/ppc4xx/interrupts.c
View File

@ -34,7 +34,6 @@
#include <ppc4xx.h> #include <ppc4xx.h>
#include <ppc_asm.tmpl> #include <ppc_asm.tmpl>
#include <commproc.h> #include <commproc.h>
#include <asm/ppc4xx-intvec.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;

1
cpu/ppc4xx/iop480_uart.c
View File

@ -26,7 +26,6 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/io.h> #include <asm/io.h>
#include <watchdog.h> #include <watchdog.h>
#include <asm/ppc4xx-intvec.h>
#ifdef CONFIG_SERIAL_MULTI #ifdef CONFIG_SERIAL_MULTI
#include <serial.h> #include <serial.h>

2
cpu/ppc4xx/usbdev.c
View File

@ -6,8 +6,8 @@
#if (defined(CONFIG_440EP) || defined(CONFIG_440EPX)) && defined(CONFIG_CMD_USB) #if (defined(CONFIG_440EP) || defined(CONFIG_440EPX)) && defined(CONFIG_CMD_USB)
#include <usb.h> #include <usb.h>
#include <asm/ppc4xx-uic.h>
#include "usbdev.h" #include "usbdev.h"
#include <asm/ppc4xx-intvec.h>
#define USB_DT_DEVICE 0x01 #define USB_DT_DEVICE 0x01
#define USB_DT_CONFIG 0x02 #define USB_DT_CONFIG 0x02

17
include/asm-ppc/ppc4xx-intvec.h → include/asm-ppc/ppc4xx-uic.h
View File

@ -1,6 +1,9 @@
/* /*
* Copyright (C) 2002 Scott McNutt <smcnutt@artesyncp.com> * Copyright (C) 2002 Scott McNutt <smcnutt@artesyncp.com>
* *
* (C) Copyright 2008
* Stefan Roese, DENX Software Engineering, sr@denx.de.
*
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
* project. * project.
* *
@ -20,16 +23,8 @@
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
/* #ifndef _PPC4xx_UIC_H_
* Interrupt vector number definitions to ease the #define _PPC4xx_UIC_H_
* 405 -- 440 porting pain ;-)
*
* NOTE: They're not all here yet ... update as needed.
*
*/
#ifndef _VECNUMS_H_
#define _VECNUMS_H_
#if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) #if defined(CONFIG_440EPX) || defined(CONFIG_440GRX)
@ -471,4 +466,4 @@
#endif /* defined(CONFIG_440) */ #endif /* defined(CONFIG_440) */
#endif /* _VECNUMS_H_ */ #endif /* _PPC4xx_UIC_H_ */

1
include/ppc4xx.h
View File

@ -54,6 +54,7 @@
#include <asm/ppc4xx-sdram.h> #include <asm/ppc4xx-sdram.h>
#include <asm/ppc4xx-ebc.h> #include <asm/ppc4xx-ebc.h>
#include <asm/ppc4xx-uic.h>
/* /*
* Macro for generating register field mnemonics * Macro for generating register field mnemonics