Move include/console/console.h to include/console.h in order to

get rid of a directory which only contains a single file, and at the same time simplify the #includes and their hierarchies. Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@313 f3766cd6-281f-0410-b1cd-43a5c92072e9
2025-05-04 01:39:18 -04:00 · 2007-05-05 20:18:28 +00:00 · 2007-05-05 20:18:28 +00:00 · 7e752a0631
commit 7e752a0631
parent c624f5ad37
40 changed files with 39 additions and 39 deletions
--- a/arch/x86/archelfboot.c
+++ b/arch/x86/archelfboot.c
@ -1,4 +1,4 @@
-#include <console/console.h>
+#include <console.h>
 // #include <ip_checksum.h>
 #include <elf.h>
 #include <elf_boot.h>
--- a/arch/x86/archtables.c
+++ b/arch/x86/archtables.c
@ -22,7 +22,7 @@
 /* 2006.1 yhlu add mptable cross 0x467 processing */

 #include <arch/types.h>
-#include <console/console.h>
+#include <console.h>
 #include <string.h>
 #include <tables.h>
 //#include <cpu/cpu.h>
--- a/arch/x86/cachemain.c
+++ b/arch/x86/cachemain.c
@ -19,7 +19,7 @@

 #include <arch/types.h>
 #include <arch/io.h>
-#include <console/console.h>
+#include <console.h>
 #include <lar.h>
 #include <tables.h>
 #include <lib.h>
--- a/arch/x86/keyboard.c
+++ b/arch/x86/keyboard.c
@ -1,4 +1,4 @@
-#include <console/console.h>
+#include <console.h>
 #include <keyboard.h>
 #include <device/device.h>
 #include <arch/io.h>
--- a/arch/x86/linuxbios_table.c
+++ b/arch/x86/linuxbios_table.c
@ -19,7 +19,7 @@
 *
 */

-#include <console/console.h>
+#include <console.h>
 #include <ip_checksum.h>
 #include <string.h>
 #include <device/device.h>
--- a/arch/x86/mc146818rtc.c
+++ b/arch/x86/mc146818rtc.c
@ -21,7 +21,7 @@

 #include <arch/types.h>
 #include <arch/io.h>
-#include <console/console.h>
+#include <console.h>
 #include <tables.h>
 #include <mc146818rtc.h>
 #include <string.h>
--- a/arch/x86/pci_ops_auto.c
+++ b/arch/x86/pci_ops_auto.c
@ -1,4 +1,4 @@
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <arch/pciconf.h>
 #include <device/pci.h>
--- a/arch/x86/pci_ops_conf1.c
+++ b/arch/x86/pci_ops_conf1.c
@ -1,4 +1,4 @@
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <arch/pciconf.h>
 #include <device/pci.h>
--- a/arch/x86/pci_ops_conf2.c
+++ b/arch/x86/pci_ops_conf2.c
@ -1,4 +1,4 @@
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <arch/pciconf.h>
 #include <device/pci.h>
--- a/arch/x86/pci_ops_mmconf.c
+++ b/arch/x86/pci_ops_mmconf.c
@ -1,5 +1,5 @@

-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <arch/pciconf.h>
 #include <device/pci.h>
--- a/console/console.c
+++ b/console/console.c
@ -1,6 +1,6 @@
 #include <arch/types.h>
 #include <arch/hlt.h>
-#include <console/console.h>
+#include <console.h>
 #include <uart8250.h>
 // FIXME: we need this for varargs
 #include <stdarg.h>
--- a/console/vsprintf.c
+++ b/console/vsprintf.c
@ -26,7 +26,7 @@

 #include <stdarg.h>
 #include <string.h>
-#include <console/console.h>
+#include <console.h>

 int vtxprintf(void (*tx_byte) (unsigned char byte, void *arg), void *arg, const char *fmt,
 	      va_list args);
--- a/device/agp_device.c
+++ b/device/agp_device.c
@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 */

-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
--- a/device/cardbus_device.c
+++ b/device/cardbus_device.c
@ -19,7 +19,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 */

-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
--- a/device/device.c
+++ b/device/device.c
@ -28,7 +28,7 @@
 * handle resource allocation for non-pci devices.
 */

-#include <console/console.h>
+#include <console.h>
 #include <arch/io.h>
 #include <device/device.h>
 #include <device/pci.h>
--- a/device/device_util.c
+++ b/device/device_util.c
@ -22,7 +22,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 */

-#include <console/console.h>
+#include <console.h>
 #include <arch/io.h>
 #include <device/device.h>
 #include <device/pci.h>
--- a/device/hypertransport.c
+++ b/device/hypertransport.c
@ -24,7 +24,7 @@
 */

 #include <bitops.h>
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/path.h>
 #include <device/pci.h>
--- a/device/pci_device.c
+++ b/device/pci_device.c
@ -26,7 +26,7 @@
 #include <arch/io.h>
 #include <string.h>
 #include <lib.h>
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
--- a/device/pci_ops.c
+++ b/device/pci_ops.c
@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 */

-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <arch/pciconf.h>
 #include <device/pci.h>
--- a/device/pci_rom.c
+++ b/device/pci_rom.c
@ -21,7 +21,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 */

-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
--- a/device/pciexp_device.c
+++ b/device/pciexp_device.c
@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 */

-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
--- a/device/pcix_device.c
+++ b/device/pcix_device.c
@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 */

-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
--- a/device/pnp_device.c
+++ b/device/pnp_device.c
@ -22,7 +22,7 @@
 */

 #include <arch/types.h>
-#include <console/console.h>
+#include <console.h>
 #include <stdlib.h>
 // #include <stdint.h>
 // #include <bitops.h>
--- a/device/root_device.c
+++ b/device/root_device.c
@ -22,7 +22,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 */

-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 // #include <part/hard_reset.h>
--- a/device/smbus_ops.c
+++ b/device/smbus_ops.c
@ -19,7 +19,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 */

-#include <console/console.h>
+#include <console.h>
 #include <stdint.h>
 #include <device/device.h>
 #include <device/path.h>
--- a/include/console/console.h
+++ b/include/console/console.h
--- a/lib/elfboot.c
+++ b/lib/elfboot.c
@ -29,7 +29,7 @@
 #include <arch/types.h>
 #include <string.h>

-#include <console/console.h>
+#include <console.h>
 #include <tables.h>
 #include <elf.h>
 #include <elf_boot.h>
--- a/lib/lar.c
+++ b/lib/lar.c
@ -21,7 +21,7 @@
 #include <arch/types.h>
 #include <string.h>
 #include <lar.h>
-#include <console/console.h>
+#include <console.h>

 #ifndef CONFIG_BIG_ENDIAN
 #define ntohl(x) ( ((x&0xff)<<24) | ((x&0xff00)<<8) | \
--- a/lib/malloc.c
+++ b/lib/malloc.c
@ -25,7 +25,7 @@

 #include <arch/types.h>
 #include <stdlib.h>
-#include <console/console.h>
+#include <console.h>

 #if 0
 #define MALLOCDBG(x...)
--- a/lib/stage2.c
+++ b/lib/stage2.c
@ -25,7 +25,7 @@
 #include <arch/types.h>
 #include <string.h>
 #include <lar.h>
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <tables.h>

--- a/lib/tables.c
+++ b/lib/tables.c
@ -19,7 +19,7 @@
 *
 */

-#include <console/console.h>
+#include <console.h>
 //#include <cpu.h>
 #include <tables.h>
 #include <tables.h>
--- a/mainboard/emulation/qemu-x86/initram.c
+++ b/mainboard/emulation/qemu-x86/initram.c
@ -17,7 +17,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 */

-#include <console/console.h>
+#include <console.h>

 int main(void)
 {
--- a/mainboard/emulation/qemu-x86/vga.c
+++ b/mainboard/emulation/qemu-x86/vga.c
@ -19,7 +19,7 @@
 */

 #include <arch/types.h>
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <string.h>
--- a/northbridge/intel/i440bxemulation/i440bx.c
+++ b/northbridge/intel/i440bxemulation/i440bx.c
@ -35,7 +35,7 @@
 */

 #include <arch/types.h>
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <string.h>
--- a/southbridge/intel/i82371eb/i82371eb.c
+++ b/southbridge/intel/i82371eb/i82371eb.c
@ -21,7 +21,7 @@
 */

 #include <arch/types.h>
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <mc146818rtc.h>
--- a/superio/winbond/w83627hf/superio.c
+++ b/superio/winbond/w83627hf/superio.c
@ -9,7 +9,7 @@
 #include <arch/io.h>
 #include <device/device.h>
 #include <device/pnp.h>
-#include <console/console.h>
+#include <console.h>
 #include <string.h>
 //#include <bitops.h>
 #include <uart8250.h>
--- a/util/x86emu/biosemu.c
+++ b/util/x86emu/biosemu.c
@ -36,7 +36,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 */
 #include <arch/io.h>
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
--- a/util/x86emu/include/x86emu/x86emu.h
+++ b/util/x86emu/include/x86emu/x86emu.h
@ -44,7 +44,7 @@

 /* FIXME: undefine printk for the moment */
 #ifdef LINUXBIOS_VERSION
-#include <console/console.h>
+#include <console.h>
 #define printk(x...) printk(BIOS_DEBUG, x)
 #else
 #define printk printf
--- a/util/x86emu/pcbios/pcibios.c
+++ b/util/x86emu/pcbios/pcibios.c
@ -35,7 +35,7 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 */
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
--- a/util/x86emu/vm86.c
+++ b/util/x86emu/vm86.c
@ -25,7 +25,7 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <console/console.h>
+#include <console.h>
 #include <string.h>
 #include <arch/io.h>