Signed-off-by: Peter Tyser ptyser@xes-inc.com --- README | 2 +- doc/TODO-i386 | 2 +- include/asm-i386/interrupt.h | 2 +- include/asm-i386/u-boot-i386.h | 4 ++-- {lib_i386 => lib/i386}/Makefile | 0 {lib_i386 => lib/i386}/bios.S | 0 {lib_i386 => lib/i386}/bios.h | 0 {lib_i386 => lib/i386}/bios_pci.S | 0 {lib_i386 => lib/i386}/bios_setup.c | 0 {lib_i386 => lib/i386}/board.c | 0 {lib_i386 => lib/i386}/bootm.c | 0 {lib_i386 => lib/i386}/config.mk | 0 {lib_i386 => lib/i386}/interrupts.c | 0 {lib_i386 => lib/i386}/pcat_interrupts.c | 0 {lib_i386 => lib/i386}/pcat_timer.c | 0 {lib_i386 => lib/i386}/pci.c | 0 {lib_i386 => lib/i386}/pci_type1.c | 0 {lib_i386 => lib/i386}/realmode.c | 0 {lib_i386 => lib/i386}/realmode_switch.S | 0 {lib_i386 => lib/i386}/timer.c | 0 {lib_i386 => lib/i386}/video.c | 0 {lib_i386 => lib/i386}/video_bios.c | 0 {lib_i386 => lib/i386}/zimage.c | 0 23 files changed, 5 insertions(+), 5 deletions(-) rename {lib_i386 => lib/i386}/Makefile (100%) rename {lib_i386 => lib/i386}/bios.S (100%) rename {lib_i386 => lib/i386}/bios.h (100%) rename {lib_i386 => lib/i386}/bios_pci.S (100%) rename {lib_i386 => lib/i386}/bios_setup.c (100%) rename {lib_i386 => lib/i386}/board.c (100%) rename {lib_i386 => lib/i386}/bootm.c (100%) rename {lib_i386 => lib/i386}/config.mk (100%) rename {lib_i386 => lib/i386}/interrupts.c (100%) rename {lib_i386 => lib/i386}/pcat_interrupts.c (100%) rename {lib_i386 => lib/i386}/pcat_timer.c (100%) rename {lib_i386 => lib/i386}/pci.c (100%) rename {lib_i386 => lib/i386}/pci_type1.c (100%) rename {lib_i386 => lib/i386}/realmode.c (100%) rename {lib_i386 => lib/i386}/realmode_switch.S (100%) rename {lib_i386 => lib/i386}/timer.c (100%) rename {lib_i386 => lib/i386}/video.c (100%) rename {lib_i386 => lib/i386}/video_bios.c (100%) rename {lib_i386 => lib/i386}/zimage.c (100%)
diff --git a/README b/README index e3ea156..7de0a86 100644 --- a/README +++ b/README @@ -186,5 +186,5 @@ Directory Hierarchy: - lib_blackfin Files generic to Blackfin architecture - lib_generic Files generic to all architectures -- lib_i386 Files generic to i386 architecture +- lib/i386 Files generic to i386 architecture - lib_m68k Files generic to m68k architecture - lib_mips Files generic to MIPS architecture diff --git a/doc/TODO-i386 b/doc/TODO-i386 index 84113f8..9769578 100644 --- a/doc/TODO-i386 +++ b/doc/TODO-i386 @@ -9,5 +9,5 @@ i386 port missing features: (and used by INT 10h and INT 16h handlers for console I/O during early linux boot...) -* missing functions in lib_i386 and cpu/i386 +* missing functions in lib/i386 and cpu/i386 * speaker beep interface
diff --git a/include/asm-i386/interrupt.h b/include/asm-i386/interrupt.h index 7f408cb..ae7540f 100644 --- a/include/asm-i386/interrupt.h +++ b/include/asm-i386/interrupt.h @@ -31,5 +31,5 @@ void set_vector(u8 intnum, void *routine);
-/* lib_i386/interupts.c */ +/* lib/i386/interupts.c */ void disable_irq(int irq); void enable_irq(int irq); diff --git a/include/asm-i386/u-boot-i386.h b/include/asm-i386/u-boot-i386.h index 3921e01..b9c6d25 100644 --- a/include/asm-i386/u-boot-i386.h +++ b/include/asm-i386/u-boot-i386.h @@ -50,5 +50,5 @@ typedef void (timer_fnc_t) (void); int register_timer_isr (timer_fnc_t *isr_func);
-/* Architecture specific - can be in cpu/i386/, lib_i386/, or $(BOARD)/ */ +/* Architecture specific - can be in cpu/i386/, lib/i386/, or $(BOARD)/ */ int timer_init(void);
@@ -66,5 +66,5 @@ void isa_unmap_rom(u32 addr); u32 isa_map_rom(u32 bus_addr, int size);
-/* lib_i386/... */ +/* lib/i386/... */ int video_bios_init(void); int video_init(void); diff --git a/lib_i386/Makefile b/lib/i386/Makefile similarity index 100% rename from lib_i386/Makefile rename to lib/i386/Makefile diff --git a/lib_i386/bios.S b/lib/i386/bios.S similarity index 100% rename from lib_i386/bios.S rename to lib/i386/bios.S diff --git a/lib_i386/bios.h b/lib/i386/bios.h similarity index 100% rename from lib_i386/bios.h rename to lib/i386/bios.h diff --git a/lib_i386/bios_pci.S b/lib/i386/bios_pci.S similarity index 100% rename from lib_i386/bios_pci.S rename to lib/i386/bios_pci.S diff --git a/lib_i386/bios_setup.c b/lib/i386/bios_setup.c similarity index 100% rename from lib_i386/bios_setup.c rename to lib/i386/bios_setup.c diff --git a/lib_i386/board.c b/lib/i386/board.c similarity index 100% rename from lib_i386/board.c rename to lib/i386/board.c diff --git a/lib_i386/bootm.c b/lib/i386/bootm.c similarity index 100% rename from lib_i386/bootm.c rename to lib/i386/bootm.c diff --git a/lib_i386/config.mk b/lib/i386/config.mk similarity index 100% rename from lib_i386/config.mk rename to lib/i386/config.mk diff --git a/lib_i386/interrupts.c b/lib/i386/interrupts.c similarity index 100% rename from lib_i386/interrupts.c rename to lib/i386/interrupts.c diff --git a/lib_i386/pcat_interrupts.c b/lib/i386/pcat_interrupts.c similarity index 100% rename from lib_i386/pcat_interrupts.c rename to lib/i386/pcat_interrupts.c diff --git a/lib_i386/pcat_timer.c b/lib/i386/pcat_timer.c similarity index 100% rename from lib_i386/pcat_timer.c rename to lib/i386/pcat_timer.c diff --git a/lib_i386/pci.c b/lib/i386/pci.c similarity index 100% rename from lib_i386/pci.c rename to lib/i386/pci.c diff --git a/lib_i386/pci_type1.c b/lib/i386/pci_type1.c similarity index 100% rename from lib_i386/pci_type1.c rename to lib/i386/pci_type1.c diff --git a/lib_i386/realmode.c b/lib/i386/realmode.c similarity index 100% rename from lib_i386/realmode.c rename to lib/i386/realmode.c diff --git a/lib_i386/realmode_switch.S b/lib/i386/realmode_switch.S similarity index 100% rename from lib_i386/realmode_switch.S rename to lib/i386/realmode_switch.S diff --git a/lib_i386/timer.c b/lib/i386/timer.c similarity index 100% rename from lib_i386/timer.c rename to lib/i386/timer.c diff --git a/lib_i386/video.c b/lib/i386/video.c similarity index 100% rename from lib_i386/video.c rename to lib/i386/video.c diff --git a/lib_i386/video_bios.c b/lib/i386/video_bios.c similarity index 100% rename from lib_i386/video_bios.c rename to lib/i386/video_bios.c diff --git a/lib_i386/zimage.c b/lib/i386/zimage.c similarity index 100% rename from lib_i386/zimage.c rename to lib/i386/zimage.c