summaryrefslogtreecommitdiffstats
path: root/arch/x86/boards/x86_generic/generic_pc.c
diff options
context:
space:
mode:
authorMichel Stam <m.stam@fugro.nl>2014-04-07 12:01:21 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-04-08 08:17:55 +0200
commit9c8f73ba86884026f4bbfc6f593d73741cfebcdc (patch)
treebaaf34e77043e6e264f5320210e1303ba8e7793a /arch/x86/boards/x86_generic/generic_pc.c
parent4d94f56c6c5ba00d35d6b3e3a1862439b2ced3f0 (diff)
downloadbarebox-9c8f73ba86884026f4bbfc6f593d73741cfebcdc.tar.gz
barebox-9c8f73ba86884026f4bbfc6f593d73741cfebcdc.tar.xz
x86: Add support for IDE on the legacy I/O ports
Signed-off-by: Michel Stam <michel@reverze.net> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/x86/boards/x86_generic/generic_pc.c')
-rw-r--r--arch/x86/boards/x86_generic/generic_pc.c53
1 files changed, 1 insertions, 52 deletions
diff --git a/arch/x86/boards/x86_generic/generic_pc.c b/arch/x86/boards/x86_generic/generic_pc.c
index 74a72243a3..5560efc889 100644
--- a/arch/x86/boards/x86_generic/generic_pc.c
+++ b/arch/x86/boards/x86_generic/generic_pc.c
@@ -24,67 +24,16 @@
#include <driver.h>
#include <init.h>
#include <asm/syslib.h>
-#include <ns16550.h>
#include <linux/err.h>
-/*
- * These datas are from the MBR, created by the linker and filled by the
- * setup tool while installing barebox on the disk drive
- */
-extern uint64_t pers_env_storage;
-extern uint16_t pers_env_size;
-extern uint8_t pers_env_drive;
-
-/**
- * Persistent environment "not used" marker.
- * Note: Must be in accordance to the value the tool "setup_mbr" writes.
- */
-#define PATCH_AREA_PERS_SIZE_UNUSED 0x000
-
static int devices_init(void)
{
- struct cdev *cdev;
-
/* extended memory only */
add_mem_device("ram0", 0x0, bios_get_memsize() << 10,
IORESOURCE_MEM_WRITEABLE);
- add_generic_device("biosdrive", DEVICE_ID_DYNAMIC, NULL, 0, 0, IORESOURCE_MEM,
- NULL);
-
- if (pers_env_size != PATCH_AREA_PERS_SIZE_UNUSED) {
- cdev = devfs_add_partition("biosdisk0",
- pers_env_storage * 512,
- (unsigned)pers_env_size * 512,
- DEVFS_PARTITION_FIXED, "env0");
- printf("Partition: %ld\n", IS_ERR(cdev) ? PTR_ERR(cdev) : 0);
- } else
- printf("No persistent storage defined\n");
-
- return 0;
-}
-device_initcall(devices_init);
-
-#ifdef CONFIG_DRIVER_SERIAL_NS16550
-
-static struct NS16550_plat serial_plat = {
- .clock = 1843200,
- .reg_read = x86_uart_read,
- .reg_write = x86_uart_write,
-};
-
-static int pc_console_init(void)
-{
- barebox_set_model("X86 generic barebox");
- barebox_set_hostname("x86");
-
- /* Register the serial port */
- add_ns16550_device(DEVICE_ID_DYNAMIC, 0x3f8, 8, 0, &serial_plat);
-
return 0;
}
-console_initcall(pc_console_init);
-
-#endif
+device_initcall(devices_init);
/** @page generic_pc Generic PC based bootloader