diff --git a/src/mainboard/technologic/ts5300/Options.lb b/src/mainboard/technologic/ts5300/Options.lb index 62f601f4c5..3ffbac7b8d 100644 --- a/src/mainboard/technologic/ts5300/Options.lb +++ b/src/mainboard/technologic/ts5300/Options.lb @@ -36,6 +36,7 @@ uses OBJCOPY uses TTYS0_BAUD uses TTYS0_BASE uses TTYS0_LCS +uses CONFIG_CHIP_NAME uses CONFIG_CONSOLE_SERIAL8250 @@ -140,6 +141,8 @@ default CONFIG_ROM_STREAM = 1 default CC="$(CROSS_COMPILE)gcc -m32" default HOSTCC="gcc" +default CONFIG_CHIP_NAME = 1 + end diff --git a/src/mainboard/technologic/ts5300/auto.c b/src/mainboard/technologic/ts5300/auto.c index 42cddb25de..4ef1a100cc 100644 --- a/src/mainboard/technologic/ts5300/auto.c +++ b/src/mainboard/technologic/ts5300/auto.c @@ -189,7 +189,7 @@ static void main(unsigned long bist) print_err("Memory initialized: 32MB\r\n"); -#if 1 +#if 0 /* clear memory 1meg */ __asm__ volatile( diff --git a/targets/agami/aruma/Config.lb b/targets/agami/aruma/Config.lb index 6f7e08019e..184e9edd6c 100644 --- a/targets/agami/aruma/Config.lb +++ b/targets/agami/aruma/Config.lb @@ -21,7 +21,7 @@ romimage "normal" option ROM_IMAGE_SIZE=0x20000 option XIP_ROM_SIZE=0x20000 option LINUXBIOS_EXTRA_VERSION=".0-normal" - payload ../../../payloads/filo.elf + payload ../../../../../../filo.elf end romimage "fallback" @@ -29,7 +29,7 @@ romimage "fallback" option ROM_IMAGE_SIZE=0x20000 option XIP_ROM_SIZE=0x20000 option LINUXBIOS_EXTRA_VERSION=".0-fallback" - payload ../../../payloads/filo.elf + payload ../../../../../../filo.elf end buildrom ./agami_aruma.rom ROM_SIZE "normal" "fallback" diff --git a/targets/technologic/ts5300/Config.lb b/targets/technologic/ts5300/Config.lb index ea9cc0623f..f4afeec03e 100644 --- a/targets/technologic/ts5300/Config.lb +++ b/targets/technologic/ts5300/Config.lb @@ -1,31 +1,34 @@ # Sample config file for Technologic Systems TS5300 -# This will make a target directory of ./ts5300 +# This will make a target directory of ./technologic_ts5300 -target ts5300 +target technologic_ts5300 mainboard technologic/ts5300 option DEFAULT_CONSOLE_LOGLEVEL=10 option MAXIMUM_CONSOLE_LOGLEVEL=10 option CONFIG_COMPRESS=1 +#option CONFIG_COMPRESS=0 + +option CONFIG_CONSOLE_VGA=0 #romimage "normal" # option USE_FALLBACK_IMAGE=0 # option ROM_IMAGE_SIZE=0x10000 -# option LINUXBIOS_EXTRA_VERSION=".0Normal" +# option LINUXBIOS_EXTRA_VERSION=".0-Normal" # payload /etc/hosts #end romimage "fallback" -# option FALLBACK_SIZE = 512 * 1024 + option FALLBACK_SIZE = 128 * 1024 # option ROM_SIZE=512*1024 # option ROM_SECTION_SIZE=512*1024 option USE_FALLBACK_IMAGE=1 option ROM_IMAGE_SIZE=32 * 1024 # 0x8000 +# option ROM_IMAGE_SIZE=48 * 1024 # 0x8000 # option ROM_IMAGE_SIZE=64 * 1024 # 0x10000 # option ROM_IMAGE_SIZE=512 * 1024 # 0x10000 - option LINUXBIOS_EXTRA_VERSION=".0Fallback" - payload ../../filo.elf -# payload ../../eepro100--ide_disk.zelf + option LINUXBIOS_EXTRA_VERSION=".0-Fallback" + payload /home/stepan/filo-ts5300.elf end -buildrom ./linuxbios.rom ROM_SIZE "fallback" +buildrom ./technologic_ts5300.rom ROM_SIZE "fallback" diff --git a/util/dump_mmcr/dumpmmcr.c b/util/dump_mmcr/dumpmmcr.c index 8e44c1abc7..a652eb3320 100644 --- a/util/dump_mmcr/dumpmmcr.c +++ b/util/dump_mmcr/dumpmmcr.c @@ -43,10 +43,10 @@ int print_mmcr(struct mmcr *mmcr) printf("drctmctl is 0x%x\n", val(mmcr, memregs.drctmctl)); printf("drccfg is 0x%x\n", val(mmcr, memregs.drccfg)); printf("bendaddr is 0x%02x%02x%02x%02x\n", - val(mmcr, memregs.drcbendadr[0]), - val(mmcr, memregs.drcbendadr[1]), + val(mmcr, memregs.drcbendadr[3]), val(mmcr, memregs.drcbendadr[2]), - val(mmcr, memregs.drcbendadr[3])); + val(mmcr, memregs.drcbendadr[1]), + val(mmcr, memregs.drcbendadr[0])); printf("eccctl is 0x%x\n", val(mmcr, memregs.eccctl)); printf("eccsta is 0x%x\n", val(mmcr, memregs.eccsta)); printf("ckbpos is 0x%x\n", val(mmcr, memregs.eccckbpos));