Update mainboard dts files to new style. Untested, but I tried to keep the new settings as close as possible to the old settings. All GeodeLX-based boards now include the geodelx/domain, geodelx/apic and geodelx/pci dts files.
Remove "enabled" keyword from the alix.1c main dts. (That's the only possibly critical change because it affects a working target. Tests on hardware appreciated. Should be harmless, though.)
Compile tested only, and the situation is better than without the patch.
Signed-off-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
Index: LinuxBIOSv3-dtsconversion/mainboard/adl/msm800sev/dts =================================================================== --- LinuxBIOSv3-dtsconversion/mainboard/adl/msm800sev/dts (Revision 605) +++ LinuxBIOSv3-dtsconversion/mainboard/adl/msm800sev/dts (Arbeitskopie) @@ -23,22 +23,19 @@ /{ mainboard-vendor = "Advanced Digital Logic"; mainboard-name = "MSM800SEV"; - cpus { - enabled; + cpus { }; + apic@0 { + /config/("northbridge/amd/geodelx/apic"); }; - domain0 { - enabled; - pcidomain = "0"; - device0,0 { - enabled; - pcipath = "1,0"; + domain@0 { + /config/("northbridge/amd/geodelx/domain"); + pci@1,0 { + /config/("northbridge/amd/geodelx/pci"); }; - southbridge { + pci@1,1 { /config/("southbridge/amd/cs5536/dts"); - pcipath = "1,1"; - enabled; }; - superio { + ioport@46 { /config/("superio/winbond/w83627hf/dts"); com1enable = "1"; }; Index: LinuxBIOSv3-dtsconversion/mainboard/amd/norwich/dts =================================================================== --- LinuxBIOSv3-dtsconversion/mainboard/amd/norwich/dts (Revision 605) +++ LinuxBIOSv3-dtsconversion/mainboard/amd/norwich/dts (Arbeitskopie) @@ -19,23 +19,19 @@ */
/{ - enabled; mainboard-vendor = "AMD"; mainboard-name = "Norwich"; - cpus { - enabled; + cpus { }; + apic@0 { + /config/("northbridge/amd/geodelx/apic"); }; - domain0 { - enabled; - pcidomain = "0"; - device0,0 { - enabled; - pcipath = "1,0"; + domain@0 { + /config/("northbridge/amd/geodelx/domain"); + pci@1,0 { + /config/("northbridge/amd/geodelx/pci"); }; - southbridge { + pci@1,1 { /config/("southbridge/amd/cs5536/dts"); - pcipath = "1,1"; - enabled; }; }; }; Index: LinuxBIOSv3-dtsconversion/mainboard/artecgroup/dbe61/dts =================================================================== --- LinuxBIOSv3-dtsconversion/mainboard/artecgroup/dbe61/dts (Revision 605) +++ LinuxBIOSv3-dtsconversion/mainboard/artecgroup/dbe61/dts (Arbeitskopie) @@ -75,21 +75,17 @@ /{ mainboard-vendor = "Artec Group"; mainboard-name = "DBE61"; - enabled; - cpus { - enabled; + cpus { }; + apic@0 { + /config/("northbridge/amd/geodelx/apic"); }; - domain0 { - enabled; - pcidomain = "0"; - device0,0 { - enabled; - pcipath = "1,0"; + domain@0 { + /config/("northbridge/amd/geodelx/domain"); + pci@1,0 { + /config/("northbridge/amd/geodelx/pci"); }; - southbridge { + pci@1,1 { /config/("southbridge/amd/cs5536/dts"); - pcipath = "1,1"; - enabled; }; }; }; Index: LinuxBIOSv3-dtsconversion/mainboard/pcengines/alix1c/dts =================================================================== --- LinuxBIOSv3-dtsconversion/mainboard/pcengines/alix1c/dts (Revision 605) +++ LinuxBIOSv3-dtsconversion/mainboard/pcengines/alix1c/dts (Arbeitskopie) @@ -19,7 +19,6 @@ */
/{ - enabled; mainboard-vendor = "PC Engines"; mainboard-name = "ALIX1.C"; cpus { };
On Sun, Feb 17, 2008 at 12:23:38AM +0100, Carl-Daniel Hailfinger wrote:
All GeodeLX-based boards now include the geodelx/domain, geodelx/apic and geodelx/pci dts files.
Please add .dts to these filenames first, or do it along with the patch.
If we do not start naming the dts files properly now, we may never.
With rename:
Acked-by: Peter Stuge peter@stuge.se
you mean add a .dts? It makes sense to me.
ron
On Sat, Feb 16, 2008 at 09:30:17PM -0800, ron minnich wrote:
you mean add a .dts? It makes sense to me.
I've done this in my working copy:
cd northbridge/amd/geodelx svn mv apic apic.dts svn mv domain domain.dts svn mv pci pci.dts cd ../../intel/i440bxemulation svn mv domain domain.dts cd ../../../southbridge/intel/i82371eb svn mv ide ide.dts cd ../../../mainboard/pcengines/alix1c sed -i '/config.*[^s]");$/s,");,.dts");,' dts cd ../../emulation/qemu-x86 sed -i '/config.*[^s]");$/s,");,.dts");,' dts
This is the patch I got. Will it be enough to commit that if it is acked, or do I need to do something else for the svn mv to be complete?
//Peter
On 17.02.2008 08:05, Peter Stuge wrote:
On Sat, Feb 16, 2008 at 09:30:17PM -0800, ron minnich wrote:
you mean add a .dts? It makes sense to me.
There is one big advantage of the current situation: The name of the struct generated by the dts matches the path of the dts (slashes are replaced with underscores). Once you add a .dts suffix, this is a lot less clear. You can of course replace the dot with an underscore as well, but then the struct name is 4 chars longer and more ugly.
I've done this in my working copy:
cd northbridge/amd/geodelx svn mv apic apic.dts svn mv domain domain.dts svn mv pci pci.dts cd ../../intel/i440bxemulation svn mv domain domain.dts cd ../../../southbridge/intel/i82371eb svn mv ide ide.dts cd ../../../mainboard/pcengines/alix1c sed -i '/config.*[^s]");$/s,");,.dts");,' dts cd ../../emulation/qemu-x86 sed -i '/config.*[^s]");$/s,");,.dts");,' dts
This is the patch I got. Will it be enough to commit that if it is acked, or do I need to do something else for the svn mv to be complete?
Doing the steps above breaks the build for Qemu.
CC build/mainboard/emulation/qemu-x86/statictree.o In file included from /sources/tmptrees/LinuxBIOSv3-tmp4/build/mainboard/emulation/qemu-x86/statictree.c:1: /sources/tmptrees/LinuxBIOSv3-tmp4/build/statictree.h:5: error: expected identifier or ‘(’ before ‘.’ token /sources/tmptrees/LinuxBIOSv3-tmp4/build/statictree.h:9: error: expected identifier or ‘(’ before ‘.’ token /sources/tmptrees/LinuxBIOSv3-tmp4/build/mainboard/emulation/qemu-x86/statictree.c:23: warning: initialization discards qualifiers from pointer target type /sources/tmptrees/LinuxBIOSv3-tmp4/build/mainboard/emulation/qemu-x86/statictree.c:35: error: expected identifier or ‘(’ before ‘.’ token /sources/tmptrees/LinuxBIOSv3-tmp4/build/mainboard/emulation/qemu-x86/statictree.c:40: error: ‘domain_0’ undeclared here (not in a function) /sources/tmptrees/LinuxBIOSv3-tmp4/build/mainboard/emulation/qemu-x86/statictree.c:79: error: expected identifier or ‘(’ before ‘.’ token /sources/tmptrees/LinuxBIOSv3-tmp4/build/mainboard/emulation/qemu-x86/statictree.c:85: error: ‘pci_1_0’ undeclared here (not in a function) make: *** [/sources/tmptrees/LinuxBIOSv3-tmp4/build/mainboard/emulation/qemu-x86/statictree.o] Fehler 1
There are a lot more fixups needed before you can commit. You have to change the dts parser, among other things.
Considering all of the things above, I have to NACK. Sorry.
Regards, Carl-Daniel
On 17.02.2008 04:57, Peter Stuge wrote:
On Sun, Feb 17, 2008 at 12:23:38AM +0100, Carl-Daniel Hailfinger wrote:
All GeodeLX-based boards now include the geodelx/domain, geodelx/apic and geodelx/pci dts files.
Please add .dts to these filenames first, or do it along with the patch.
If we do not start naming the dts files properly now, we may never.
With rename:
Acked-by: Peter Stuge peter@stuge.se
We can always rename stuff later. Right now the contents of all mainboard dts files except one don't even have the specified syntax. Conformance before cosmetics, I'd say.
So yes, I'd like to commit without the rename and leave the rename to a later commit (if any). Besides that, making the syntax conform to the spec is an entirely different change from moving and should be in a separate changeset.
Regards, Carl-Daniel
Carl-Daniel, I am convinced. No rename just yet.
I have not been able to test. I will try to test tonight and, if it works, ack.
ron
On 17.02.2008 19:51, ron minnich wrote:
Tested and boots a working linux on alix1c.
Acked-by: Ronald G. Minnich rminnich@gmail.com
Thank you for testing! Committed in r607.
Regards, Carl-Daniel
-
Carl-Daniel Hailfinger -
Peter Stuge -
ron minnich