Merge git://git.denx.de/u-boot-x86

6 files changed, 36 insertions, 28 deletions

diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S
index e1f634f..30fa7de 100644
--- a/arch/x86/cpu/start.S
+++ b/arch/x86/cpu/start.S
@@ -16,6 +16,7 @@
 #include <asm/processor-flags.h>
 #include <generated/generic-asm-offsets.h>
 #include <generated/asm-offsets.h>
+#include <linux/linkage.h>
 
 .section .text.start
 .code32
@@ -184,13 +185,8 @@ board_init_f_r_trampoline:
 	movl	%eax, %esp
 
 	/* See if we need to disable CAR */
-.weak	car_uninit
-	movl	$car_uninit, %eax
-	cmpl	$0, %eax
-	jz	1f
-
 	call	car_uninit
-1:
+
 	/* Re-enter U-Boot by calling board_init_f_r() */
 	call	board_init_f_r
 
@@ -199,6 +195,10 @@ die:
 	jmp	die
 	hlt
 
+WEAK(car_uninit)
+	ret
+ENDPROC(car_uninit)
+
 blank_idt_ptr:
 	.word	0		/* limit */
 	.long	0		/* base */
diff --git a/arch/x86/include/asm/arch-baytrail/acpi/southcluster.asl b/arch/x86/include/asm/arch-baytrail/acpi/southcluster.asl
index dfc768c..2a1c31c 100644
--- a/arch/x86/include/asm/arch-baytrail/acpi/southcluster.asl
+++ b/arch/x86/include/asm/arch-baytrail/acpi/southcluster.asl
@@ -150,9 +150,9 @@ Device (PCI0)
 		CreateQwordField(MCRS, ^UMEM._MAX, UMAX)
 		CreateQwordField(MCRS, ^UMEM._LEN, ULEN)
 
-		/* Set base address to 48GB and allocate 16GB for PCI space */
-		Store(0xc00000000, UMIN)
-		Store(0x400000000, ULEN)
+		/* Set base address to 16GB and allocate 48GB for PCI space */
+		Store(0x400000000, UMIN)
+		Store(0xc00000000, ULEN)
 		Add(UMIN, Subtract(ULEN, 1), UMAX)
 
 		Return (MCRS)
diff --git a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig
index a386502..29e6204 100644
--- a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig
+++ b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig
@@ -6,7 +6,7 @@ CONFIG_INTERNAL_UART=y
 CONFIG_FLASH_DESCRIPTOR_FILE="descriptor-pcie-x4.bin"
 CONFIG_SMP=y
 CONFIG_HAVE_VGA_BIOS=y
-CONFIG_VGA_BIOS_ADDR=0xfffa0000
+CONFIG_VGA_BIOS_ADDR=0xfffb0000
 CONFIG_GENERATE_PIRQ_TABLE=y
 CONFIG_GENERATE_MP_TABLE=y
 CONFIG_GENERATE_ACPI_TABLE=y
@@ -26,6 +26,7 @@ CONFIG_CMD_CPU=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_PART=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
diff --git a/configs/theadorable-x86-conga-qa3-e3845_defconfig b/configs/theadorable-x86-conga-qa3-e3845_defconfig
index 8cd170f..b05634d 100644
--- a/configs/theadorable-x86-conga-qa3-e3845_defconfig
+++ b/configs/theadorable-x86-conga-qa3-e3845_defconfig
@@ -5,7 +5,7 @@ CONFIG_TARGET_THEADORABLE_X86_CONGA_QA3_E3845=y
 CONFIG_INTERNAL_UART=y
 CONFIG_SMP=y
 CONFIG_HAVE_VGA_BIOS=y
-CONFIG_VGA_BIOS_ADDR=0xfffa0000
+CONFIG_VGA_BIOS_ADDR=0xfffb0000
 CONFIG_GENERATE_PIRQ_TABLE=y
 CONFIG_GENERATE_MP_TABLE=y
 CONFIG_GENERATE_ACPI_TABLE=y
@@ -25,6 +25,7 @@ CONFIG_CMD_CPU=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_PART=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig
index 71ff04e..741312f 100644
--- a/configs/theadorable-x86-dfi-bt700_defconfig
+++ b/configs/theadorable-x86-dfi-bt700_defconfig
@@ -4,7 +4,7 @@ CONFIG_VENDOR_DFI=y
 CONFIG_TARGET_THEADORABLE_X86_DFI_BT700=y
 CONFIG_SMP=y
 CONFIG_HAVE_VGA_BIOS=y
-CONFIG_VGA_BIOS_ADDR=0xfffa0000
+CONFIG_VGA_BIOS_ADDR=0xfffb0000
 CONFIG_GENERATE_PIRQ_TABLE=y
 CONFIG_GENERATE_MP_TABLE=y
 CONFIG_GENERATE_ACPI_TABLE=y
diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h
index a9aef12..e0a033b 100644
--- a/include/configs/theadorable-x86-common.h
+++ b/include/configs/theadorable-x86-common.h
@@ -57,39 +57,45 @@
 	"addmtd=setenv bootargs ${bootargs} ${mtdparts}\0"	\
 	"addmisc=setenv bootargs ${bootargs} "			\
 		"intel-spi.writeable=1 vmalloc=300M "		\
-		"pci=realloc=on,hpmemsize=0x12000000,"		\
-		"hpmemprefsize=0,hpiosize=0\0"	    		\
+		"pci=realloc=on,hpmemsize=0,hpiosize=0\0"	\
 	"bootcmd=if env exists recovery_status;"		\
 		"then run swupdate;"				\
 		"else run yocto_boot;run swupdate;"		\
 		"fi\0"						\
+	"setroot=part uuid scsi 0:${partnr} uuid;"		\
+		"setenv root PARTUUID=${uuid}\0"		\
+	"setroot_ubuntu=setenv partnr ${ubuntu_part};run setroot\0" \
+	"setroot_yocto=setenv partnr ${yocto_part};run setroot\0" \
 	"ubuntu_args=setenv bootargs "				\
-		"root=/dev/sda${ubuntu_part} ro\0"		\
+		"root=${root} ro\0"				\
 	"ubuntu_args_quiet=setenv bootargs "			\
-		"root=/dev/sda${ubuntu_part} ro quiet\0"	\
+		"root=${root} ro quiet\0"			\
 	"ubuntu_load=load scsi 0:${ubuntu_part} 03000000 "	\
 		"/boot/vmlinuz-${kernel-ver};"			\
 		"load scsi 0:${ubuntu_part} 04000000 "		\
 		"/boot/initrd.img-${kernel-ver}\0"		\
-	"ubuntu_boot=run ubuntu_args_quiet addmtd addmisc "	\
-		"ubuntu_load boot\0"				\
-	"ubuntu_boot_console=run ubuntu_args addtty_ubuntu "	\
+	"ubuntu_boot=run setroot_ubuntu ubuntu_args_quiet "	\
 		"addmtd addmisc ubuntu_load boot\0"		\
-	"net_args=setenv bootargs root=/dev/sda${ubuntu_part} ro\0" \
-	"net_boot=run start_eth net_args addtty_yocto addmtd addmisc;" \
+	"ubuntu_boot_console=run setroot_ubuntu ubuntu_args "	\
+		"addtty_ubuntu addmtd addmisc ubuntu_load boot\0" \
+	"net_args=setenv bootargs root=${root} ro\0"		\
+	"net_boot=run start_eth setroot_ubuntu net_args "	\
+		"addtty_ubuntu addmtd addmisc;"			\
 		"tftp 03000000 ${tftpdir}/bzImage;"		\
 		"load scsi 0:${ubuntu_part} 04000000 "		\
 		"/boot/initrd.img-${kernel-ver};"		\
 		"run boot\0"					\
-	"yocto_args=setenv bootargs root=/dev/sda${yocto_part} " \
-		"panic=1\0"				\
-	"yocto_args_fast=setenv bootargs root=/dev/sda${yocto_part} " \
+	"yocto_args=setenv bootargs root=${root} "		\
+		"panic=1\0"					\
+	"yocto_args_fast=setenv bootargs root=${root} "		\
 		"quiet panic=1\0"				\
-	"yocto_boot=run yocto_args addmtd addmisc addtty_yocto;" \
+	"yocto_boot=run setroot_yocto yocto_args addmtd addmisc " \
+		"addtty_yocto;"	\
 		"if run yocto_load;then zboot 03000000;fi\0"	\
-	"yocto_boot_fast=run yocto_args_fast addmtd addmisc "	\
-		"addtty_yocto yocto_load;zboot 03000000\0"	\
-	"yocto_boot_tftp=run yocto_args addmtd addmisc addtty_yocto " \
+	"yocto_boot_fast=run setroot_yocto yocto_args_fast addmtd " \
+		"addmisc addtty_yocto yocto_load;zboot 03000000\0" \
+	"yocto_boot_tftp=run setroot_yocto yocto_args addmtd "	\
+		"addmisc addtty_yocto "				\
 		"start_eth yocto_load_tftp;zboot 03000000\0"	\
 	"yocto_kernel=bzImage\0"				\
 	"yocto_load=load scsi 0:${yocto_part} 03000000 "	\