[coreboot-gerrit] New patch to review for filo: 5ac0041 Adapt CONFIG_* defines to current libpayload

Patrick Georgi (patrick@georgi-clan.de) gerrit at coreboot.org
Thu Aug 14 20:50:13 CEST 2014


Patrick Georgi (patrick at georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6667

-gerrit

commit 5ac00416c1ebfb8ca7308fb807dc010d01c5025b
Author: Patrick Georgi <patrick at georgi-clan.de>
Date:   Thu Aug 14 20:48:22 2014 +0200

    Adapt CONFIG_* defines to current libpayload
    
    New libpayload prefixes its variables with CONFIG_LP_.
    Prefix the users that refer to libpayload defines so
    things build again.
    
    Change-Id: I474813bede5e50e78c6a211cefea18e934cb8a63
    Signed-off-by: Patrick Georgi <patrick at georgi-clan.de>
---
 drivers/hdreg.h      | 8 ++++----
 drivers/ide_new.c    | 2 +-
 drivers/ide_new.h    | 4 ++--
 main/filo.c          | 2 +-
 main/grub/builtins.c | 2 +-
 x86/linux_load.c     | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/hdreg.h b/drivers/hdreg.h
index eb4ff41..9666ddf 100644
--- a/drivers/hdreg.h
+++ b/drivers/hdreg.h
@@ -257,20 +257,20 @@ struct hd_driveid {
 };
 
 struct request_sense {
-#if defined(CONFIG_BIG_ENDIAN)
+#if defined(CONFIG_LP_BIG_ENDIAN)
 	u8 valid		: 1;
 	u8 error_code		: 7;
-#elif defined(CONFIG_LITTLE_ENDIAN)
+#elif defined(CONFIG_LP_LITTLE_ENDIAN)
 	u8 error_code		: 7;
 	u8 valid		: 1;
 #endif
 	u8 segment_number;
-#if defined(CONFIG_BIG_ENDIAN)
+#if defined(CONFIG_LP_BIG_ENDIAN)
 	u8 reserved1		: 2;
 	u8 ili			: 1;
 	u8 reserved2		: 1;
 	u8 sense_key		: 4;
-#elif defined(CONFIG_LITTLE_ENDIAN)
+#elif defined(CONFIG_LP_LITTLE_ENDIAN)
 	u8 sense_key		: 4;
 	u8 reserved2		: 1;
 	u8 ili			: 1;
diff --git a/drivers/ide_new.c b/drivers/ide_new.c
index 326430c..de4f733 100644
--- a/drivers/ide_new.c
+++ b/drivers/ide_new.c
@@ -861,7 +861,7 @@ ob_ide_fixup_string(unsigned char *s, unsigned int len)
 	/*
 	 * if little endian arch, byte swap the string
 	 */
-#ifdef CONFIG_LITTLE_ENDIAN
+#ifdef CONFIG_LP_LITTLE_ENDIAN
 	for (p = end ; p != s;) {
 		unsigned short *pp = (unsigned short *) (p -= 2);
 		*pp = be16toh(*pp);
diff --git a/drivers/ide_new.h b/drivers/ide_new.h
index 1d4dea0..0598993 100644
--- a/drivers/ide_new.h
+++ b/drivers/ide_new.h
@@ -211,11 +211,11 @@ enum {
 struct ata_sector {
 	u16 all;
 	union {
-#ifdef CONFIG_BIG_ENDIAN
+#ifdef CONFIG_LP_BIG_ENDIAN
 		u8 high;
 		u8 low;
 #endif
-#ifdef CONFIG_LITTLE_ENDIAN
+#ifdef CONFIG_LP_LITTLE_ENDIAN
 		u8 low;
 		u8 high;
 #endif
diff --git a/main/filo.c b/main/filo.c
index 7d83d80..ab97c6a 100644
--- a/main/filo.c
+++ b/main/filo.c
@@ -89,7 +89,7 @@ static void init(void)
     printf("No USB stack in libpayload.\n");
 #endif
 #endif
-#if defined(CONFIG_PC_KEYBOARD) || defined(CONFIG_USB_HID)
+#if defined(CONFIG_LP_PC_KEYBOARD) || defined(CONFIG_LP_USB_HID)
     add_reset_handler(filo_reset_handler);
 #endif
 #ifdef CONFIG_SUPPORT_SOUND
diff --git a/main/grub/builtins.c b/main/grub/builtins.c
index f77a21a..cd079d1 100644
--- a/main/grub/builtins.c
+++ b/main/grub/builtins.c
@@ -1838,7 +1838,7 @@ static struct builtin builtin_timeout = {
 
 static int keymap_func(char *arg, int flags)
 {
-#ifdef CONFIG_PC_KEYBOARD
+#ifdef CONFIG_LP_PC_KEYBOARD
 	if (keyboard_set_layout(arg)) {
 		errnum = ERR_BAD_ARGUMENT;
 		return 1;
diff --git a/x86/linux_load.c b/x86/linux_load.c
index 0e4c1e1..93f6725 100644
--- a/x86/linux_load.c
+++ b/x86/linux_load.c
@@ -350,7 +350,7 @@ static void set_memory_size(struct linux_params *params)
 /* Video mode */
 static void set_video_mode(struct linux_params *params)
 {
-#if CONFIG_COREBOOT_VIDEO_CONSOLE
+#if CONFIG_LP_COREBOOT_VIDEO_CONSOLE
 	/* Are we running on a framebuffer console? */
 	if (!lib_sysinfo.framebuffer)
 		return;
@@ -704,7 +704,7 @@ static int start_linux(u32 kern_addr, struct linux_params *params)
 {
 	struct segment_desc *linux_gdt;
 	struct context *ctx;
-#ifdef CONFIG_VGA_VIDEO_CONSOLE
+#ifdef CONFIG_LP_VGA_VIDEO_CONSOLE
 	unsigned int cursor_x, cursor_y, cursor_en;
 #endif
 #ifdef CONFIG_PCMCIA_CF
@@ -747,7 +747,7 @@ static int start_linux(u32 kern_addr, struct linux_params *params)
 	debug("EIP=%#x\n", kern_addr);
 	printf("Jumping to entry point...\n");
 
-#ifdef CONFIG_VGA_VIDEO_CONSOLE
+#ifdef CONFIG_LP_VGA_VIDEO_CONSOLE
 	/* Update VGA cursor position.
 	 * This must be here because the printf changes the value! */
 	video_console_get_cursor(&cursor_x, &cursor_y, &cursor_en);



More information about the coreboot-gerrit mailing list