diff options
| author | Nico Huber <nico.h@gmx.de> | 2014-10-12 16:37:42 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2014-10-17 11:24:15 +0200 |
| commit | cbe3c7050fa57f8cd2cd0cd6bc8e4ac4fce7d35c (patch) | |
| tree | ae6c55fb8b4762ff05fb0f2974fb705d76626fe8 | |
| parent | 3dc12c1e19181bb9bacebeda706c39cfb57eb326 (diff) | |
libpayload: Fix missed CONFIG_ -> CONFIG_LP_ substitutions
Change-Id: I1c64a9a649398ebe2eda179907c470f99caa9fc3
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: http://review.coreboot.org/7056
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
| -rw-r--r-- | payloads/libpayload/drivers/Makefile.inc | 4 | ||||
| -rw-r--r-- | payloads/libpayload/drivers/storage/ahci_ata.c | 4 | ||||
| -rw-r--r-- | payloads/libpayload/sample/Makefile | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/payloads/libpayload/drivers/Makefile.inc b/payloads/libpayload/drivers/Makefile.inc index 881c80118c..ed8fe4106d 100644 --- a/payloads/libpayload/drivers/Makefile.inc +++ b/payloads/libpayload/drivers/Makefile.inc @@ -51,8 +51,8 @@ libc-$(CONFIG_LP_GEODELX_VIDEO_CONSOLE) += video/geodelx.c libc-$(CONFIG_LP_GEODELX_VIDEO_CONSOLE) += video/font8x16.c # coreboot generic framebuffer driver -libc-$(CONFIG_COREBOOT_VIDEO_CONSOLE) += video/corebootfb.c -libc-$(CONFIG_COREBOOT_VIDEO_CONSOLE) += video/font8x16.c +libc-$(CONFIG_LP_COREBOOT_VIDEO_CONSOLE) += video/corebootfb.c +libc-$(CONFIG_LP_COREBOOT_VIDEO_CONSOLE) += video/font8x16.c # AHCI/ATAPI driver libc-$(CONFIG_LP_STORAGE) += storage/storage.c diff --git a/payloads/libpayload/drivers/storage/ahci_ata.c b/payloads/libpayload/drivers/storage/ahci_ata.c index 1efec23ec4..a9380b647b 100644 --- a/payloads/libpayload/drivers/storage/ahci_ata.c +++ b/payloads/libpayload/drivers/storage/ahci_ata.c @@ -56,7 +56,7 @@ ssize_t ahci_ata_read_sectors(ata_dev_t *const ata_dev, printf("ahci: Sector count too high (max. 256).\n"); count = 256; } -#ifdef CONFIG_STORAGE_64BIT_LBA +#ifdef CONFIG_LP_STORAGE_64BIT_LBA } else if (ata_dev->read_cmd == ATA_READ_DMA_EXT) { if (start >= (1ULL << 48)) { printf("ahci: Sector is not 48-bit addressable.\n"); @@ -84,7 +84,7 @@ ssize_t ahci_ata_read_sectors(ata_dev_t *const ata_dev, dev->cmdtable->fis[ 6] = (start >> 16) & 0xff; dev->cmdtable->fis[ 7] = FIS_H2D_DEV_LBA; dev->cmdtable->fis[ 8] = (start >> 24) & 0xff; -#ifdef CONFIG_STORAGE_64BIT_LBA +#ifdef CONFIG_LP_STORAGE_64BIT_LBA if (ata_dev->read_cmd == ATA_READ_DMA_EXT) { dev->cmdtable->fis[ 9] = (start >> 32) & 0xff; dev->cmdtable->fis[10] = (start >> 40) & 0xff; diff --git a/payloads/libpayload/sample/Makefile b/payloads/libpayload/sample/Makefile index 2029209c41..0ac1839c63 100644 --- a/payloads/libpayload/sample/Makefile +++ b/payloads/libpayload/sample/Makefile @@ -31,9 +31,9 @@ include ../.xcompile include ../.config -ARCH-$(CONFIG_ARCH_ARMV) := arm -ARCH-$(CONFIG_ARCH_POWERPC) := powerpc -ARCH-$(CONFIG_ARCH_X86) := i386 +ARCH-$(CONFIG_LP_ARCH_ARMV) := arm +ARCH-$(CONFIG_LP_ARCH_POWERPC) := powerpc +ARCH-$(CONFIG_LP_ARCH_X86) := i386 CC := $(CC_$(ARCH-y)) AS := $(AS_$(ARCH-y)) |