diff options
Diffstat (limited to 'arch/x86/boards/x86_generic')
-rw-r--r-- | arch/x86/boards/x86_generic/Makefile | 4 | ||||
-rw-r--r-- | arch/x86/boards/x86_generic/disk_bios_drive.c | 33 | ||||
-rw-r--r-- | arch/x86/boards/x86_generic/env/bin/boot | 37 | ||||
-rw-r--r-- | arch/x86/boards/x86_generic/env/bin/init | 15 | ||||
-rw-r--r-- | arch/x86/boards/x86_generic/env/config | 31 | ||||
-rw-r--r-- | arch/x86/boards/x86_generic/envsector.h | 24 | ||||
-rw-r--r-- | arch/x86/boards/x86_generic/generic_pc.c | 18 | ||||
-rw-r--r-- | arch/x86/boards/x86_generic/intf_platform_ide.c | 80 | ||||
-rw-r--r-- | arch/x86/boards/x86_generic/serial_ns16550.c | 35 |
9 files changed, 0 insertions, 277 deletions
diff --git a/arch/x86/boards/x86_generic/Makefile b/arch/x86/boards/x86_generic/Makefile deleted file mode 100644 index fca707dd8b..0000000000 --- a/arch/x86/boards/x86_generic/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -obj-y += generic_pc.o -obj-$(CONFIG_DISK_INTF_PLATFORM_IDE) += intf_platform_ide.o -obj-$(CONFIG_DISK_BIOS) += disk_bios_drive.o -obj-$(CONFIG_DRIVER_SERIAL_NS16550) += serial_ns16550.o diff --git a/arch/x86/boards/x86_generic/disk_bios_drive.c b/arch/x86/boards/x86_generic/disk_bios_drive.c deleted file mode 100644 index c8e9ae8523..0000000000 --- a/arch/x86/boards/x86_generic/disk_bios_drive.c +++ /dev/null @@ -1,33 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -// SPDX-FileCopyrightText: 2009 Juergen Beisert, Pengutronix - -/** - * @file - * @brief Generic PC support for the BIOS disk interface - */ - -#include <common.h> -#include <driver.h> -#include <init.h> -#include <linux/err.h> -#include "envsector.h" - -static int bios_disk_init(void) -{ - struct cdev *cdev; - - 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(bios_disk_init); diff --git a/arch/x86/boards/x86_generic/env/bin/boot b/arch/x86/boards/x86_generic/env/bin/boot deleted file mode 100644 index fcfffe3194..0000000000 --- a/arch/x86/boards/x86_generic/env/bin/boot +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -. /env/config - -if [ x$1 = xdisk ]; then - root=disk - kernel=disk -fi - -if [ x$1 = xnet ]; then - root=net - kernel=net -fi - -if [ x$ip = xdhcp ]; then - bootargs="$bootargs ip=dhcp" -else - bootargs="$bootargs ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask:::" -fi - -if [ x$root = xdisk ]; then - bootargs="$bootargs root=$rootpart_disk rootfstype=$rootpart_fs rw" -else - bootargs="$bootargs root=/dev/nfs nfsroot=$eth0.serverip:$nfsroot,v3,tcp rw" -fi - -if [ $kernel = net ]; then - if [ x$ip = xdhcp ]; then - dhcp - fi - tftp $uimage uImage || exit 1 - bootm uImage -else - bootargs="BOOT_IMAGE=$kernel_device auto $bootargs" - linux16 $kernel_device -fi - diff --git a/arch/x86/boards/x86_generic/env/bin/init b/arch/x86/boards/x86_generic/env/bin/init deleted file mode 100644 index 2924a4449a..0000000000 --- a/arch/x86/boards/x86_generic/env/bin/init +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -PATH=/env/bin -export PATH - -. /env/config - -echo -echo -n "Hit any key to stop autoboot: " -timeout -a $autoboot_timeout -if [ $? != 0 ]; then - exit -fi - -boot diff --git a/arch/x86/boards/x86_generic/env/config b/arch/x86/boards/x86_generic/env/config deleted file mode 100644 index dd57aad716..0000000000 --- a/arch/x86/boards/x86_generic/env/config +++ /dev/null @@ -1,31 +0,0 @@ -# -# basic config -# -# boot source: 'disk' or 'net' -kernel=disk -root=disk - -# data for the NFS case -nfsroot="/path/to/nfs_root" - -# data for the disk case -kernel_device=/dev/biosdisk0.1 -rootpart_disk=/dev/sda1 -rootpart_fs=ext2 - -baudrate=115200 -serial=ttyS0 - -# use UART for console -bootargs="console=$serial,$baudrate" - -autoboot_timeout=3 - -# use 'dhcp' to do dhcp in uboot and in kernel -# ip=dhcp -# or set your networking parameters here -# eth0.ipaddr=192.168.3.11 -# eth0.netmask=255.255.255.0 -# eth0.gateway=a.b.c.d -# eth0.serverip=192.168.3.10 -# eth0.ethaddr=aa.bb.cc.dd.ee.ff diff --git a/arch/x86/boards/x86_generic/envsector.h b/arch/x86/boards/x86_generic/envsector.h deleted file mode 100644 index 57a6d2a21f..0000000000 --- a/arch/x86/boards/x86_generic/envsector.h +++ /dev/null @@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -/** - * @file - * @brief x86 Generic PC common definitions - */ -#ifndef __X86_ENVSECTOR_H -#define __ENVSECTOR_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 - -#endif diff --git a/arch/x86/boards/x86_generic/generic_pc.c b/arch/x86/boards/x86_generic/generic_pc.c deleted file mode 100644 index 2f1db7aca1..0000000000 --- a/arch/x86/boards/x86_generic/generic_pc.c +++ /dev/null @@ -1,18 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -// SPDX-FileCopyrightText: 2009 Juergen Beisert, Pengutronix - -#include <common.h> -#include <types.h> -#include <driver.h> -#include <init.h> -#include <asm/syslib.h> -#include <linux/err.h> - -static int devices_init(void) -{ - /* extended memory only */ - add_mem_device("ram0", 0x0, bios_get_memsize() << 10, - IORESOURCE_MEM_WRITEABLE); - return 0; -} -device_initcall(devices_init); diff --git a/arch/x86/boards/x86_generic/intf_platform_ide.c b/arch/x86/boards/x86_generic/intf_platform_ide.c deleted file mode 100644 index 0db031484f..0000000000 --- a/arch/x86/boards/x86_generic/intf_platform_ide.c +++ /dev/null @@ -1,80 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -// SPDX-FileCopyrightText: 2014 Juergen Beisert, Pengutronix -// SPDX-FileCopyrightText: 2014 Michel Stam, Fugro Intersite - -/** - * @file - * @brief Generic PC support for the IDE platform driver - */ - -#include <common.h> -#include <driver.h> -#include <init.h> -#include <linux/err.h> -#include <platform_data/ide.h> -#include "envsector.h" - -static struct ide_port_info ide_plat = { - .ioport_shift = 0, - .dataif_be = 0, -}; - -static struct resource primary_ide_resources[] = { - { - .name = "base", - .start = 0x1f0, - .end = 0x1f7, - .flags = IORESOURCE_IO - }, - { - .name = "alt", - .start = 0x3f6, - .end = 0x3f7, - .flags = IORESOURCE_IO - } -}; - -static struct resource secondary_ide_resources[] = { - { - .name = "base", - .start = 0x170, - .end = 0x177, - .flags = IORESOURCE_IO - }, -}; - -static struct device_d primary_ide_device = { - .name = "ide_intf", - .id = 0, - .platform_data = &ide_plat, - .resource = primary_ide_resources, - .num_resources = ARRAY_SIZE(primary_ide_resources), -}; - -static struct device_d secondary_ide_device = { - .name = "ide_intf", - .id = 1, - .platform_data = &ide_plat, - .resource = secondary_ide_resources, - .num_resources = ARRAY_SIZE(secondary_ide_resources), -}; - -static int platform_ide_init(void) -{ - struct cdev *cdev; - - platform_device_register(&primary_ide_device); - platform_device_register(&secondary_ide_device); - - if (pers_env_size != PATCH_AREA_PERS_SIZE_UNUSED) { - cdev = devfs_add_partition("ata0", - 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(platform_ide_init); diff --git a/arch/x86/boards/x86_generic/serial_ns16550.c b/arch/x86/boards/x86_generic/serial_ns16550.c deleted file mode 100644 index 4159bc39fb..0000000000 --- a/arch/x86/boards/x86_generic/serial_ns16550.c +++ /dev/null @@ -1,35 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -// SPDX-FileCopyrightText: 2009 Juergen Beisert, Pengutronix -// SPDX-FileCopyrightText: 2009 Michel Stam, Fugro Intersite - -/** - * @file - * @brief Generic PC support to let barebox acting as a boot loader - */ - -#include <common.h> -#include <types.h> -#include <driver.h> -#include <init.h> -#include <asm/syslib.h> -#include <platform_data/serial-ns16550.h> -#include <linux/err.h> - -static struct NS16550_plat serial_plat = { - .clock = 1843200, -}; - -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, IORESOURCE_IO, - &serial_plat); - add_ns16550_device(DEVICE_ID_DYNAMIC, 0x2f8, 8, IORESOURCE_IO, - &serial_plat); - - return 0; -} -console_initcall(pc_console_init); |