[LinuxBIOS] r395 - in LinuxBIOSv3/mainboard: adl/msm800sev amd/norwich artecgroup/dbe61 emulation/qemu-x86
Author: rminnich Date: 2007-06-28 18:48:40 +0200 (Thu, 28 Jun 2007) New Revision: 395
Modified: LinuxBIOSv3/mainboard/adl/msm800sev/Makefile LinuxBIOSv3/mainboard/amd/norwich/Makefile LinuxBIOSv3/mainboard/artecgroup/dbe61/Makefile LinuxBIOSv3/mainboard/artecgroup/dbe61/initram.c LinuxBIOSv3/mainboard/emulation/qemu-x86/Makefile Log: Remove all references to mainboard.o Get dbe61 initram into buildable shape. This depends the msr_t patch which is in the pipeline. Signed-off-by: Ronald G. Minnich rminnich@gmail.com Acked-by: Ronald G. Minnich rminnich@gmail.com
Modified: LinuxBIOSv3/mainboard/adl/msm800sev/Makefile =================================================================== --- LinuxBIOSv3/mainboard/adl/msm800sev/Makefile 2007-06-28 16:21:38 UTC (rev 394) +++ LinuxBIOSv3/mainboard/adl/msm800sev/Makefile 2007-06-28 16:48:40 UTC (rev 395) @@ -23,7 +23,8 @@ $(Q)printf " BUILD DUMMY VPD\n" $(Q)dd if=/dev/zero of=$(obj)/linuxbios.vpd bs=256 count=1 $(SILENT)
-INITRAM_OBJ=$(obj)/stage0.init $(obj)/stage0.o $(obj)/mainboard/$(MAINBOARDDIR)/initram.o \ +INITRAM_OBJ=$(obj)/stage0.init $(obj)/stage0.o \ + $(obj)/mainboard/$(MAINBOARDDIR)/initram.o \ $(obj)/northbridge/amd/geodelx/raminit.o \ $(obj)/southbridge/amd/cs5536/smbus_initram.o \ $(obj)/southbridge/amd/cs5536/cs5536_early_setup.o\ @@ -50,8 +51,6 @@ # Miscellaneous important targets. #
-$(obj)/mainboard/$(MAINBOARDDIR)/mainboard.o: $(obj)/mainboard/$(MAINBOARDDIR)/statictree.o - $(obj)/mainboard/$(MAINBOARDDIR)/statictree.o: $(obj)/mainboard/$(MAINBOARDDIR)/statictree.c $(obj)/statictree.h $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n" $(Q)$(CC) $(INITCFLAGS) $(LINUXBIOSINCLUDE) -c -o $@ $< @@ -75,7 +74,7 @@ $(Q)printf " OBJCOPY $(subst $(shell pwd)/,,$(@))\n" $(Q)$(OBJCOPY) -O binary $< $@
-STAGE2_MAINBOARD_OBJ = mainboard.o +STAGE2_MAINBOARD_OBJ =
STAGE2_CHIPSET_OBJ = $(obj)/arch/x86/geodecpu.o
Modified: LinuxBIOSv3/mainboard/amd/norwich/Makefile =================================================================== --- LinuxBIOSv3/mainboard/amd/norwich/Makefile 2007-06-28 16:21:38 UTC (rev 394) +++ LinuxBIOSv3/mainboard/amd/norwich/Makefile 2007-06-28 16:48:40 UTC (rev 395) @@ -43,8 +43,6 @@ # Miscellaneous important targets. #
-$(obj)/mainboard/$(MAINBOARDDIR)/mainboard.o: $(obj)/mainboard/$(MAINBOARDDIR)/statictree.o - $(obj)/mainboard/$(MAINBOARDDIR)/statictree.o: $(obj)/mainboard/$(MAINBOARDDIR)/statictree.c $(obj)/statictree.h $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n" $(Q)$(CC) $(INITCFLAGS) $(LINUXBIOSINCLUDE) -c -o $@ $< @@ -68,7 +66,7 @@ $(Q)printf " OBJCOPY $(subst $(shell pwd)/,,$(@))\n" $(Q)$(OBJCOPY) -O binary $< $@
-STAGE2_MAINBOARD_OBJ = mainboard.o +STAGE2_MAINBOARD_OBJ =
STAGE2_CHIPSET_OBJ = $(obj)/arch/x86/geodelx/cpu.o
Modified: LinuxBIOSv3/mainboard/artecgroup/dbe61/Makefile =================================================================== --- LinuxBIOSv3/mainboard/artecgroup/dbe61/Makefile 2007-06-28 16:21:38 UTC (rev 394) +++ LinuxBIOSv3/mainboard/artecgroup/dbe61/Makefile 2007-06-28 16:48:40 UTC (rev 395) @@ -40,8 +40,6 @@ # Miscellaneous important targets. #
-$(obj)/mainboard/$(MAINBOARDDIR)/mainboard.o: $(obj)/mainboard/$(MAINBOARDDIR)/statictree.o - $(obj)/mainboard/$(MAINBOARDDIR)/statictree.o: $(obj)/mainboard/$(MAINBOARDDIR)/statictree.c $(obj)/statictree.h $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n" $(Q)$(CC) $(INITCFLAGS) $(LINUXBIOSINCLUDE) -c -o $@ $< @@ -65,7 +63,7 @@ $(Q)printf " OBJCOPY $(subst $(shell pwd)/,,$(@))\n" $(Q)$(OBJCOPY) -O binary $< $@
-STAGE2_MAINBOARD_OBJ = mainboard.o +STAGE2_MAINBOARD_OBJ =
STAGE2_CHIPSET_OBJ = $(obj)/arch/x86/geodelx/cpu.o
Modified: LinuxBIOSv3/mainboard/artecgroup/dbe61/initram.c =================================================================== --- LinuxBIOSv3/mainboard/artecgroup/dbe61/initram.c 2007-06-28 16:21:38 UTC (rev 394) +++ LinuxBIOSv3/mainboard/artecgroup/dbe61/initram.c 2007-06-28 16:48:40 UTC (rev 395) @@ -43,9 +43,15 @@ */ #define GPIO_BASE 0x6100
+/* empty function to always fail smbus reads */ +int smbus_read_byte(unsigned device, unsigned address) +{ + return -1; +} + static void init_gpio(void) { - msr_t msr; + struct msr_struct msr; printk(BIOS_DEBUG, "Initializing GPIO module...\n");
// initialize the GPIO LBAR @@ -63,7 +69,7 @@ * width in bits (byte 6,7) * = Density per side (byte 31) * number of sides (byte 5) */ /* 1. Initialize GLMC registers base on SPD values, do one DIMM for now */ - msr_t msr; + struct msr_struct msr;
msr.hi = 0x10075012; msr.lo = 0x00000040; @@ -101,13 +107,21 @@ /* Hold Count - how long we will sit in reset */ #define PLLMSRlo 0x00DE0000
+struct wmsr { + u32 reg; + struct msr_struct msr; +} dbe61_msr[] = { + {.reg = 0x10000020, {.lo = 0xfff80, .hi = 0x20000000}}, + {.reg = 0x10000021, {.lo = 0x80fffe0, .hi = 0x20000000}}, + {.reg = 0x40000020, {.lo = 0xfff80, .hi = 0x20000000}}, + {.reg = 0x40000021, {.lo = 0x80fffe0, .hi = 0x20000000}}, +}; + static void dbe61_msr_init(void) { - __builtin_wrmsr(0x10000020, 0xfff80, 0x20000000); - __builtin_wrmsr(0x10000021, 0x80fffe0, 0x20000000); - - __builtin_wrmsr(0x40000020, 0xfff80, 0x20000000); - __builtin_wrmsr(0x40000021, 0x80fffe0, 0x20000000); + int i; + for(i = 0; i < sizeof(dbe61_msr)/sizeof(dbe61_msr[0]); i++) + wrmsr(dbe61_msr[i].reg, dbe61_msr[i].msr); }
int main(void)
Modified: LinuxBIOSv3/mainboard/emulation/qemu-x86/Makefile =================================================================== --- LinuxBIOSv3/mainboard/emulation/qemu-x86/Makefile 2007-06-28 16:21:38 UTC (rev 394) +++ LinuxBIOSv3/mainboard/emulation/qemu-x86/Makefile 2007-06-28 16:48:40 UTC (rev 395) @@ -50,8 +50,6 @@ # Miscellaneous important targets. #
-$(obj)/mainboard/$(MAINBOARDDIR)/mainboard.o: $(obj)/mainboard/$(MAINBOARDDIR)/statictree.o - $(obj)/mainboard/$(MAINBOARDDIR)/statictree.o: $(obj)/mainboard/$(MAINBOARDDIR)/statictree.c $(obj)/statictree.h $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n" $(Q)$(CC) $(INITCFLAGS) $(LINUXBIOSINCLUDE) -c -o $@ $< @@ -75,7 +73,7 @@ $(Q)printf " OBJCOPY $(subst $(shell pwd)/,,$(@))\n" $(Q)$(OBJCOPY) -O binary $< $@
-STAGE2_MAINBOARD_OBJ = mainboard.o vga.o +STAGE2_MAINBOARD_OBJ = vga.o
STAGE2_CHIPSET_OBJ =
-
svn＠openbios.org