From 2496b32d66ee1e10e1faa16bfed77eba9fedbdde Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Thu, 7 Jan 2010 14:52:40 +0900 Subject: [PATCH] s5pc1xx: remove unnecessary header files Signed-off-by: Minkyu Kang --- board/samsung/universal/lowlevel_init.S | 21 +++++------ board/samsung/universal/mem_setup.S | 3 +- cpu/arm_cortexa8/s5pc1xx/usb-hs-otg.h | 1 - include/asm-arm/arch-s5pc1xx/hardware.h | 63 -------------------------------- include/asm-arm/arch-s5pc1xx/interrupt.h | 41 --------------------- include/asm-arm/arch-s5pc1xx/mem.h | 9 ----- include/asm-arm/arch-s5pc1xx/watchdog.h | 16 -------- 7 files changed, 10 insertions(+), 144 deletions(-) delete mode 100644 include/asm-arm/arch-s5pc1xx/hardware.h delete mode 100644 include/asm-arm/arch-s5pc1xx/interrupt.h delete mode 100644 include/asm-arm/arch-s5pc1xx/watchdog.h diff --git a/board/samsung/universal/lowlevel_init.S b/board/samsung/universal/lowlevel_init.S index bc3d53e..55eab2e 100644 --- a/board/samsung/universal/lowlevel_init.S +++ b/board/samsung/universal/lowlevel_init.S @@ -26,11 +26,8 @@ #include #include #include -#include #include #include -#include -#include #define DEBUG_PM_C110 #undef DEBUG_PM_C110 @@ -114,20 +111,20 @@ lowlevel_init: /* Disable all interrupts (VIC0, VIC1 and VIC2) */ mvn r3, #0x0 - str r3, [r0, #VIC_INTENCLEAR_OFFSET] - str r3, [r1, #VIC_INTENCLEAR_OFFSET] - str r3, [r2, #VIC_INTENCLEAR_OFFSET] + str r3, [r0, #0x14] @INTENCLEAR + str r3, [r1, #0x14] @INTENCLEAR + str r3, [r2, #0x14] @INTENCLEAR #ifndef CONFIG_ONENAND_IPL /* Set all interrupts as IRQ */ - str r5, [r0, #VIC_INTSELECT_OFFSET] - str r5, [r1, #VIC_INTSELECT_OFFSET] - str r5, [r2, #VIC_INTSELECT_OFFSET] + str r5, [r0, #0xc] @INTSELECT + str r5, [r1, #0xc] @INTSELECT + str r5, [r2, #0xc] @INTSELECT /* Pending Interrupt Clear */ - str r5, [r0, #VIC_INTADDRESS_OFFSET] - str r5, [r1, #VIC_INTADDRESS_OFFSET] - str r5, [r2, #VIC_INTADDRESS_OFFSET] + str r5, [r0, #0xf00] @INTADDRESS + str r5, [r1, #0xf00] @INTADDRESS + str r5, [r2, #0xf00] @INTADDRESS #endif #ifndef CONFIG_ONENAND_IPL diff --git a/board/samsung/universal/mem_setup.S b/board/samsung/universal/mem_setup.S index d933e0b..b18144c 100644 --- a/board/samsung/universal/mem_setup.S +++ b/board/samsung/universal/mem_setup.S @@ -23,7 +23,6 @@ */ #include -#include .globl mem_ctrl_asm_init mem_ctrl_asm_init: @@ -129,7 +128,7 @@ swap_memory: * [ 3:0 ] 2: 4 banks */ eoreq r3, r3, #0x08000000 - streq r3, [r0, #MEMCONFIG1_OFFSET] + streq r3, [r0, #0xc] @ MEMCONFIG1_OFFSET ldr r1, =0x20000000 str r1, [r0, #0x014] @ PRECHCONFIG_OFFSET diff --git a/cpu/arm_cortexa8/s5pc1xx/usb-hs-otg.h b/cpu/arm_cortexa8/s5pc1xx/usb-hs-otg.h index 670be59..6d2e46e 100644 --- a/cpu/arm_cortexa8/s5pc1xx/usb-hs-otg.h +++ b/cpu/arm_cortexa8/s5pc1xx/usb-hs-otg.h @@ -24,7 +24,6 @@ #include #include -#include #include #define make_word_c(w) __constant_cpu_to_le16(w) diff --git a/include/asm-arm/arch-s5pc1xx/hardware.h b/include/asm-arm/arch-s5pc1xx/hardware.h deleted file mode 100644 index 84d24c9..0000000 --- a/include/asm-arm/arch-s5pc1xx/hardware.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Originates from Samsung's u-boot 1.1.6 port to S3C6400 / SMDK6400 - * - * (C) Copyright 2008 - * Guennadi Liakhovetki, DENX Software Engineering, - * - * 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 - */ - -#ifndef _ARCH_HARDWARE_H_ -#define _ARCH_HARDWARE_H_ - -#include - -#ifndef __ASSEMBLY__ -#define UData(Data) ((unsigned long) (Data)) - -#define __REG(x) (*(vu_long *)(x)) -#define __REGl(x) (*(vu_long *)(x)) -#define __REGw(x) (*(vu_short *)(x)) -#define __REGb(x) (*(vu_char *)(x)) -#define __REG2(x, y) (*(vu_long *)((x) + (y))) -#else -#define UData(Data) (Data) - -#define __REG(x) (x) -#define __REGl(x) (x) -#define __REGw(x) (x) -#define __REGb(x) (x) -#define __REG2(x, y) ((x) + (y)) -#endif - -#define Fld(Size, Shft) (((Size) << 16) + (Shft)) - -#define FSize(Field) ((Field) >> 16) -#define FShft(Field) ((Field) & 0x0000FFFF) -#define FMsk(Field) (((UData (1) << FSize (Field)) - 1) << FShft (Field)) -#define FAlnMsk(Field) ((UData (1) << FSize (Field)) - 1) -#define F1stBit(Field) (UData (1) << FShft (Field)) - -#define FClrBit(Data, Bit) (Data = (Data & ~(Bit))) -#define FClrFld(Data, Field) (Data = (Data & ~FMsk(Field))) - -#define FInsrt(Value, Field) \ - (UData (Value) << FShft (Field)) - -#define FExtr(Data, Field) \ - ((UData (Data) >> FShft (Field)) & FAlnMsk (Field)) - -#endif /* _ARCH_HARDWARE_H_ */ diff --git a/include/asm-arm/arch-s5pc1xx/interrupt.h b/include/asm-arm/arch-s5pc1xx/interrupt.h deleted file mode 100644 index 44d6f0f..0000000 --- a/include/asm-arm/arch-s5pc1xx/interrupt.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * (C) Copyright 2009 - * Samsung Electronics, - * Heungjun Kim - * Minkyu Kang - * - * 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 - * - */ - -#ifndef __ASM_ARM_ARCH_INTERRUPT_H_ -#define __ASM_ARM_ARCH_INTERRUPT_H_ - -/* Vector Interrupt Offset */ -#define VIC_IRQSTATUS_OFFSET 0x0 -#define VIC_FIQSTATUS_OFFSET 0x4 -#define VIC_RAWINTR_OFFSET 0x8 -#define VIC_INTSELECT_OFFSET 0xc -#define VIC_INTENABLE_OFFSET 0x10 -#define VIC_INTENCLEAR_OFFSET 0x14 -#define VIC_SOFTINT_OFFSET 0x18 -#define VIC_SOFTINTCLEAR_OFFSET 0x1c -#define VIC_PROTECTION_OFFSET 0x20 -#define VIC_SWPRIORITYMASK_OFFSET 0x24 -#define VIC_PRIORITYDAISY_OFFSET 0x28 -#define VIC_INTADDRESS_OFFSET 0xf00 - -#endif diff --git a/include/asm-arm/arch-s5pc1xx/mem.h b/include/asm-arm/arch-s5pc1xx/mem.h index 3271c91..97c04a0 100644 --- a/include/asm-arm/arch-s5pc1xx/mem.h +++ b/include/asm-arm/arch-s5pc1xx/mem.h @@ -24,16 +24,7 @@ #ifndef __ASM_ARM_ARCH_MEM_H_ #define __ASM_ARM_ARCH_MEM_H_ -/* - * SROMC Controller - */ /* DRAM Memory Controller */ - -#define S5PC100_DMC_BASE 0xE6000000 -#define S5PC110_DMC0_BASE 0xF0000000 -#define S5PC110_DMC1_BASE 0xF1400000 - -/* DMC offset */ #define CONCONTROL_OFFSET 0x00 #define MEMCONTROL_OFFSET 0x04 #define MEMCONFIG0_OFFSET 0x08 diff --git a/include/asm-arm/arch-s5pc1xx/watchdog.h b/include/asm-arm/arch-s5pc1xx/watchdog.h deleted file mode 100644 index 668bb09..0000000 --- a/include/asm-arm/arch-s5pc1xx/watchdog.h +++ /dev/null @@ -1,16 +0,0 @@ - -/* - * Watchdog - */ -#define S5P_WATCHDOG_BASE(x) (S5P_PA_WATCHDOG + (x)) - -#define WTCON_OFFSET 0x0 -#define WTDAT_OFFSET 0x4 -#define WTCNT_OFFSET 0x8 -#define WTCLRINT_OFFSET 0xc - -#define S5P_WTCON S5P_WATCHDOG_BASE(WTCON_OFFSET) -#define S5P_WTDAT S5P_WATCHDOG_BASE(WTDAT_OFFSET) -#define S5P_WTCNT S5P_WATCHDOG_BASE(WTCNT_OFFSET) -#define S5P_WTCLRINT S5P_WATCHDOG_BASE(WTCLRINT_OFFSET) - -- 2.7.4