[coreboot] [PATCH] v3: Fix compilation after switch to explicit dts naming

Carl-Daniel Hailfinger c-d.hailfinger.devel.2006 at gmx.net
Wed Jan 30 03:30:38 CET 2008


Ron: This fixes breakage of non-Alix targets caused by r566.

Can someone please commit if this gets an Ack? I will be offline
tomorrow.

Regards,
Carl-Daniel
----

Fix compilation after switch to explicit dts naming.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>

Index: LinuxBIOSv3-explicit_dts_compilefix/superio/winbond/w83627hf/superio.c
===================================================================
--- LinuxBIOSv3-explicit_dts_compilefix/superio/winbond/w83627hf/superio.c	(Revision 568)
+++ LinuxBIOSv3-explicit_dts_compilefix/superio/winbond/w83627hf/superio.c	(Arbeitskopie)
@@ -115,7 +115,7 @@
 
 static void w83627hf_init(struct device * dev)
 {
-	struct superio_winbond_w83627hf_config *conf;
+	struct superio_winbond_w83627hf_dts_config *conf;
 	struct resource *res0, *res1;
 	struct pc_keyboard keyboard;
 
Index: LinuxBIOSv3-explicit_dts_compilefix/mainboard/adl/msm800sev/dts
===================================================================
--- LinuxBIOSv3-explicit_dts_compilefix/mainboard/adl/msm800sev/dts	(Revision 568)
+++ LinuxBIOSv3-explicit_dts_compilefix/mainboard/adl/msm800sev/dts	(Arbeitskopie)
@@ -34,12 +34,12 @@
 			pcipath = "1,0";
 		};
 		southbridge {
-			/config/("southbridge/amd/cs5536");
+			/config/("southbridge/amd/cs5536/dts");
 			pcipath = "1,1";
 			enabled;
 		};
 		superio {
-			/config/("superio/winbond/w83627hf");
+			/config/("superio/winbond/w83627hf/dts");
 			com1enable = "1";
 		};
 	};
Index: LinuxBIOSv3-explicit_dts_compilefix/mainboard/amd/norwich/dts
===================================================================
--- LinuxBIOSv3-explicit_dts_compilefix/mainboard/amd/norwich/dts	(Revision 568)
+++ LinuxBIOSv3-explicit_dts_compilefix/mainboard/amd/norwich/dts	(Arbeitskopie)
@@ -33,7 +33,7 @@
 			pcipath = "1,0";
 		};
 		southbridge {
-			/config/("southbridge/amd/cs5536");
+			/config/("southbridge/amd/cs5536/dts");
 			pcipath = "1,1";
 			enabled;
 		};
Index: LinuxBIOSv3-explicit_dts_compilefix/mainboard/artecgroup/dbe61/dts
===================================================================
--- LinuxBIOSv3-explicit_dts_compilefix/mainboard/artecgroup/dbe61/dts	(Revision 568)
+++ LinuxBIOSv3-explicit_dts_compilefix/mainboard/artecgroup/dbe61/dts	(Arbeitskopie)
@@ -87,7 +87,7 @@
 			pcipath = "1,0";
 		};
 		southbridge {
-			/config/("southbridge/amd/cs5536");
+			/config/("southbridge/amd/cs5536/dts");
 			pcipath = "1,1";
 			enabled;
 		};
Index: LinuxBIOSv3-explicit_dts_compilefix/mainboard/pcengines/alix1c/dts
===================================================================
--- LinuxBIOSv3-explicit_dts_compilefix/mainboard/pcengines/alix1c/dts	(Revision 568)
+++ LinuxBIOSv3-explicit_dts_compilefix/mainboard/pcengines/alix1c/dts	(Arbeitskopie)
@@ -26,7 +26,7 @@
 		enabled;
 	};
 	domain0 {
-		/config/("northbridge/amd/geodelx");
+		/config/("northbridge/amd/geodelx/dts");
 		enabled;
 		pcidomain = "0";
 		device0,0 {
@@ -34,12 +34,12 @@
 			pcipath = "1,0";
 		};
 		southbridge {
-			/config/("southbridge/amd/cs5536");
+			/config/("southbridge/amd/cs5536/dts");
 			pcipath = "0xf,1";
 			enabled;
 		};
 		superio {
-			/config/("superio/winbond/w83627hf");
+			/config/("superio/winbond/w83627hf/dts");
 			com1enable = "1";
 		};
 	};
Index: LinuxBIOSv3-explicit_dts_compilefix/mainboard/emulation/qemu-x86/dts
===================================================================
--- LinuxBIOSv3-explicit_dts_compilefix/mainboard/emulation/qemu-x86/dts	(Revision 568)
+++ LinuxBIOSv3-explicit_dts_compilefix/mainboard/emulation/qemu-x86/dts	(Arbeitskopie)
@@ -27,7 +27,7 @@
 		enabled;
 	};
 	domain0 {
-		/config/("northbridge/intel/i440bxemulation");
+		/config/("northbridge/intel/i440bxemulation/dts");
 		ops = "i440bxemulation_pcidomainops";
 		enabled;
 		pcidomain = "0";
@@ -36,7 +36,7 @@
 			pcipath = "0,0";
 		};
 		southbridge,intel,i82371eb {
-			/config/("southbridge/intel/i82371eb");
+			/config/("southbridge/intel/i82371eb/dts");
 			pcipath = "1,0";
 			enabled;
 		};
Index: LinuxBIOSv3-explicit_dts_compilefix/northbridge/intel/i440bxemulation/i440bx.c
===================================================================
--- LinuxBIOSv3-explicit_dts_compilefix/northbridge/intel/i440bxemulation/i440bx.c	(Revision 568)
+++ LinuxBIOSv3-explicit_dts_compilefix/northbridge/intel/i440bxemulation/i440bx.c	(Arbeitskopie)
@@ -53,7 +53,7 @@
 	struct device *mc_dev;
 	u32 tolmk;		/* Top of low mem, Kbytes. */
 	int idx;
-	struct northbridge_intel_i440bxemulation_config *device_configuration =
+	struct northbridge_intel_i440bxemulation_dts_config *device_configuration =
 	    dev->device_configuration;
 	tolmk = device_configuration->ramsize * 1024;
 	mc_dev = dev->link[0].children;






More information about the coreboot mailing list