From 4fb25a3db3b3839094aa9ab748efd7a95924690b Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Wed, 25 Jun 2008 10:59:22 +0200 Subject: [PATCH] ppc4xx: Consolidate PPC4xx UIC defines 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 --- board/amcc/sequoia/sequoia.c | 3 +- cpu/ppc4xx/4xx_enet.c | 1 - cpu/ppc4xx/4xx_uart.c | 2 +- cpu/ppc4xx/interrupts.c | 1 - cpu/ppc4xx/iop480_uart.c | 1 - cpu/ppc4xx/usbdev.c | 2 +- .../asm-ppc/{ppc4xx-intvec.h => ppc4xx-uic.h} | 51 +++++++++---------- include/ppc4xx.h | 1 + 8 files changed, 27 insertions(+), 35 deletions(-) rename include/asm-ppc/{ppc4xx-intvec.h => ppc4xx-uic.h} (95%) diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c index b833092f19..87f5d5d6c1 100644 --- a/board/amcc/sequoia/sequoia.c +++ b/board/amcc/sequoia/sequoia.c @@ -25,12 +25,11 @@ #include #include #include -#include +#include #include #include #include #include -#include DECLARE_GLOBAL_DATA_PTR; diff --git a/cpu/ppc4xx/4xx_enet.c b/cpu/ppc4xx/4xx_enet.c index 26d74d258d..47d8abc177 100644 --- a/cpu/ppc4xx/4xx_enet.c +++ b/cpu/ppc4xx/4xx_enet.c @@ -90,7 +90,6 @@ #include <405_mal.h> #include #include -#include /* * Only compile for platform with AMCC EMAC ethernet controller and diff --git a/cpu/ppc4xx/4xx_uart.c b/cpu/ppc4xx/4xx_uart.c index a7587d4351..766e586808 100644 --- a/cpu/ppc4xx/4xx_uart.c +++ b/cpu/ppc4xx/4xx_uart.c @@ -46,7 +46,7 @@ #include #include #include -#include +#include #ifdef CONFIG_SERIAL_MULTI #include diff --git a/cpu/ppc4xx/interrupts.c b/cpu/ppc4xx/interrupts.c index 8620e2b484..eb9cb1d397 100644 --- a/cpu/ppc4xx/interrupts.c +++ b/cpu/ppc4xx/interrupts.c @@ -34,7 +34,6 @@ #include #include #include -#include DECLARE_GLOBAL_DATA_PTR; diff --git a/cpu/ppc4xx/iop480_uart.c b/cpu/ppc4xx/iop480_uart.c index 3af0767c55..0e3423f7ab 100644 --- a/cpu/ppc4xx/iop480_uart.c +++ b/cpu/ppc4xx/iop480_uart.c @@ -26,7 +26,6 @@ #include #include #include -#include #ifdef CONFIG_SERIAL_MULTI #include diff --git a/cpu/ppc4xx/usbdev.c b/cpu/ppc4xx/usbdev.c index d71ba7710a..27e6a4056c 100644 --- a/cpu/ppc4xx/usbdev.c +++ b/cpu/ppc4xx/usbdev.c @@ -6,8 +6,8 @@ #if (defined(CONFIG_440EP) || defined(CONFIG_440EPX)) && defined(CONFIG_CMD_USB) #include +#include #include "usbdev.h" -#include #define USB_DT_DEVICE 0x01 #define USB_DT_CONFIG 0x02 diff --git a/include/asm-ppc/ppc4xx-intvec.h b/include/asm-ppc/ppc4xx-uic.h similarity index 95% rename from include/asm-ppc/ppc4xx-intvec.h rename to include/asm-ppc/ppc4xx-uic.h index 5b45de4335..1573b1eab1 100644 --- a/include/asm-ppc/ppc4xx-intvec.h +++ b/include/asm-ppc/ppc4xx-uic.h @@ -1,35 +1,30 @@ /* -* Copyright (C) 2002 Scott McNutt -* -* See file CREDITS for list of people who contributed to this -* project. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation; either version 2 of -* the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, -* MA 02111-1307 USA -*/ - -/* - * Interrupt vector number definitions to ease the - * 405 -- 440 porting pain ;-) + * Copyright (C) 2002 Scott McNutt + * + * (C) Copyright 2008 + * Stefan Roese, DENX Software Engineering, sr@denx.de. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. * - * NOTE: They're not all here yet ... update as needed. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA */ -#ifndef _VECNUMS_H_ -#define _VECNUMS_H_ +#ifndef _PPC4xx_UIC_H_ +#define _PPC4xx_UIC_H_ #if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) @@ -471,4 +466,4 @@ #endif /* defined(CONFIG_440) */ -#endif /* _VECNUMS_H_ */ +#endif /* _PPC4xx_UIC_H_ */ diff --git a/include/ppc4xx.h b/include/ppc4xx.h index ca0636ca85..d593b072fc 100644 --- a/include/ppc4xx.h +++ b/include/ppc4xx.h @@ -54,6 +54,7 @@ #include #include +#include /* * Macro for generating register field mnemonics -- 2.39.5