From d95ecd734176d64d755da1effbd58a1d6b87bc3b Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Wed, 28 Nov 2012 02:03:57 +0100 Subject: [PATCH] Remove empty devices implementation and use the one from uboot. Since we have the same setup with a loaded and mapped boot archive, we can reuse the MemoryDevice implemented in uboot. This gets the loader to the stage where it loads and attempts to boot the kernel. --- .../boot/platform/raspberrypi_arm/Jamfile | 3 ++ .../boot/platform/raspberrypi_arm/devices.cpp | 47 ------------------- 2 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 src/system/boot/platform/raspberrypi_arm/devices.cpp diff --git a/src/system/boot/platform/raspberrypi_arm/Jamfile b/src/system/boot/platform/raspberrypi_arm/Jamfile index 7293dbf9a0..069861bb80 100644 --- a/src/system/boot/platform/raspberrypi_arm/Jamfile +++ b/src/system/boot/platform/raspberrypi_arm/Jamfile @@ -48,6 +48,9 @@ BootMergeObject boot_platform_raspberrypi_arm.o : SEARCH on [ FGristFiles $(genericPlatformSources) ] = [ FDirName $(HAIKU_TOP) src system boot platform generic ] ; +SEARCH on [ FGristFiles devices.cpp ] + = [ FDirName $(HAIKU_TOP) src system boot platform u-boot ] ; + # Tell the build system to where stage1.bin can be found, so it can be used # elsewhere. diff --git a/src/system/boot/platform/raspberrypi_arm/devices.cpp b/src/system/boot/platform/raspberrypi_arm/devices.cpp deleted file mode 100644 index 277c58c9ec..0000000000 --- a/src/system/boot/platform/raspberrypi_arm/devices.cpp +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2009 Jonas Sundström, jonas@kirilla.com - * All rights reserved. Distributed under the terms of the MIT License. - */ - - -#include -#include -#include -#include -#include - -#include - - -status_t -platform_add_boot_device(struct stage2_args* args, NodeList* devicesList) -{ -#warning IMPLEMENT platform_add_boot_device - return B_ERROR; -} - - -status_t -platform_get_boot_partition(struct stage2_args* args, Node* bootDevice, - NodeList* list, boot::Partition** _partition) -{ -#warning IMPLEMENT platform_get_boot_partition - return B_ERROR; -} - - -status_t -platform_add_block_devices(stage2_args* args, NodeList* devicesList) -{ -#warning IMPLEMENT platform_add_block_devices - return B_ERROR; -} - - -status_t -platform_register_boot_device(Node* device) -{ -#warning IMPLEMENT platform_register_boot_device - return B_ERROR; -} -