diff --git a/ram.img b/ram.img index cb2f07a..2e477a2 100755 Binary files a/ram.img and b/ram.img differ diff --git a/ram_init.vhd b/ram_init.vhd index 2b77149..586819e 100644 --- a/ram_init.vhd +++ b/ram_init.vhd @@ -117,16 +117,16 @@ package bootrom is x"410b6483", x"60834f26", x"000b68f6", - x"0000132c", + x"00001064", x"d0034f22", x"400b0009", x"4f26000b", x"00090009", - x"00001344", + x"0000107c", x"000b0009", x"d101412b", x"00090009", - x"000011e8", + x"00001224", x"614c6213", x"729f622c", x"e3053236", @@ -201,7 +201,7 @@ package bootrom is x"6bf66af6", x"69f6000b", x"68f60009", - x"000013e4", + x"000013bc", x"2f86e800", x"2f966953", x"2fa66a53", @@ -247,7 +247,7 @@ package bootrom is x"68f60009", x"000001a8", x"00000310", - x"000013e4", + x"000013bc", x"000001c0", x"2f862f96", x"2fa62fb6", @@ -349,8 +349,8 @@ package bootrom is x"68f60009", x"000001a8", x"00000310", - x"00001390", - x"000013e4", + x"00001368", + x"000013bc", x"2f862f96", x"2fa62fb6", x"2fc62fd6", @@ -541,15 +541,15 @@ package bootrom is x"000001c0", x"000001a8", x"0000034c", - x"0000139c", + x"00001374", x"00000db8", x"0000021c", x"000003cc", x"00000f0c", x"00000260", x"00000310", - x"00001394", - x"000013e4", + x"0000136c", + x"000013bc", x"00000fe8", x"00000f7c", x"00000db8", @@ -646,12 +646,12 @@ package bootrom is x"000003cc", x"00000f7c", x"0000034c", - x"000013a0", - x"0000143c", + x"00001378", + x"00001414", x"0000021c", x"00000dc4", x"00001060", - x"0000139c", + x"00001374", x"2f862448", x"2f962fa6", x"2fb62fc6", @@ -721,12 +721,12 @@ package bootrom is x"68f60009", x"000001a8", x"00000310", - x"0000140c", - x"000013f8", - x"00000260", - x"000013b4", - x"000013b8", x"000013e4", + x"000013d0", + x"00000260", + x"0000138c", + x"00001390", + x"000013bc", x"00000564", x"2f866043", x"2f964009", @@ -812,7 +812,7 @@ package bootrom is x"6af669f6", x"000b68f6", x"000001a8", - x"000013e4", + x"000013bc", x"00000f0c", x"000001c0", x"00000564", @@ -835,7 +835,7 @@ package bootrom is x"d00164f2", x"400b0009", x"00000b48", - x"000016e8", + x"000016c0", x"2f062f16", x"e0f0400e", x"e0052f06", @@ -883,7 +883,7 @@ package bootrom is x"70c05101", x"6002002b", x"00090009", - x"00001690", + x"00001668", x"ef046ff2", x"e0006002", x"402b0009", @@ -956,18 +956,18 @@ package bootrom is x"f80007ff", x"402b400b", x"c3200009", - x"000016d0", + x"000016a8", x"0000fb00", x"00008900", x"00008b00", x"0000f000", x"0000a000", x"0000f0ff", - x"00001690", + x"00001668", x"0000b000", x"0000ff00", x"0000c300", - x"000016ec", + x"000016c4", x"00000d76", x"e1163416", x"8d2de000", @@ -995,8 +995,8 @@ package bootrom is x"5116e004", x"2512000b", x"00090009", - x"00001690", - x"000016d0", + x"00001668", + x"000016a8", x"e1163416", x"8d2ce000", x"6243c702", @@ -1022,13 +1022,13 @@ package bootrom is x"1154d103", x"1156e004", x"000b0009", - x"00001690", - x"000016d0", + x"00001668", + x"000016a8", x"24488901", x"d1021145", x"d102412b", x"00090009", - x"000016d0", + x"000016a8", x"00000d76", x"d1056211", x"22288904", @@ -1036,8 +1036,8 @@ package bootrom is x"2321e200", x"2121000b", x"00090009", - x"000016ec", - x"000016d0", + x"000016c4", + x"000016a8", x"d001402b", x"00090009", x"00000a18", @@ -1051,10 +1051,35 @@ package bootrom is x"91032212", x"2312000b", x"00090088", - x"0000162c", - x"0000168c", + x"00001604", + x"00001664", x"abcd0000", x"000b0009", + x"d104644c", + x"5012c808", + x"8bfcd102", + x"1141000b", + x"00090009", + x"abcd0100", + x"d1035012", + x"c80189fc", + x"d1016012", + x"000b600c", + x"abcd0100", + x"d0062f86", + x"4f22400b", + x"0009d105", + x"6803410b", + x"64036083", + x"4f26000b", + x"68f60009", + x"0000107c", + x"00001064", + x"d102e202", + x"1123000b", + x"00090009", + x"abcd0100", + x"000b0009", x"2f866843", x"2f962fa6", x"d9094f22", @@ -1067,42 +1092,32 @@ package bootrom is x"60804f26", x"6af669f6", x"000b68f6", - x"0000132c", + x"00001064", x"d1012142", x"000b0009", x"abcd0000", - x"2f862f96", - x"69432fa6", - x"d80bda0c", - x"4f2260a2", - x"c8018907", - x"940d480b", - x"0009940b", - x"480b0009", - x"aff50009", - x"d1052192", - x"4f266af6", - x"69f6000b", - x"68f60081", + x"d208d109", + x"930b970b", + x"6022c801", + x"89032132", + x"2172aff9", + x"0009d103", + x"2142000b", + x"00090081", x"00820009", - x"00001098", x"abcd0044", - x"2f862f96", - x"69432fa6", - x"d80bda0c", - x"4f2260a2", - x"c8018907", - x"940d480b", - x"0009940b", - x"480b0009", - x"aff50009", - x"d1062192", - x"4f266af6", - x"69f6000b", - x"68f60083", + x"abcd0000", + x"d208d109", + x"930b970b", + x"6022c801", + x"89032132", + x"2172aff9", + x"0009d105", + x"2142000b", + x"00090083", x"00840009", - x"00001098", x"abcd0044", + x"abcd0000", x"abcd0040", x"2f86e103", x"2f966943", @@ -1119,7 +1134,7 @@ package bootrom is x"4f2669f6", x"412b68f6", x"00b00009", - x"000010e4", + x"00001134", x"2f86e700", x"2f966943", x"2fa62fb6", @@ -1150,36 +1165,36 @@ package bootrom is x"4f266bf6", x"6af669f6", x"412b68f6", - x"0000144c", - x"000010a4", - x"2f86e440", - x"2f962fa6", - x"d8424f22", - x"480b7ffc", - x"d041d942", - x"400b0009", - x"480be442", - x"d440490b", - x"0009d440", + x"00001424", + x"00001108", + x"2f86e140", + x"2f96d843", + x"d0434f22", + x"d9437ffc", + x"2812400b", + x"0009e142", + x"2812d441", x"490b0009", - x"480be450", - x"e100d93e", - x"9a6d2f12", - x"60f2019c", - x"611c31a0", - x"8d0ae501", - x"60f2d13a", - x"049c410b", - x"644c61f2", - x"71012f12", - x"aff00009", - x"d136410b", - x"e400d136", - x"d436410b", - x"e907e100", - x"da352f12", - x"61f23197", - x"891866f2", + x"d440490b", + x"0009e150", + x"2812e100", + x"d83e996e", + x"2f1260f2", + x"018c611c", + x"31908d0a", + x"e50160f2", + x"d13a048c", + x"410b644c", + x"61f27101", + x"2f12aff0", + x"0009d137", + x"410be400", + x"d136d437", + x"410be807", + x"e100d936", + x"2f1261f2", + x"31878d19", + x"e25166f2", x"e10167f2", x"641362f2", x"7708447d", @@ -1188,76 +1203,51 @@ package bootrom is x"6213426d", x"247b242b", x"62337218", - x"412d4a0b", + x"412d490b", x"241b61f2", x"71012f12", - x"afe40009", - x"480be451", + x"afe30009", + x"d11c2122", x"e1009233", x"2f1261f2", x"31278904", x"61f27101", x"2f12aff8", - x"0009480b", - x"e455e100", - x"92262f12", - x"61f23127", - x"890461f2", + x"0009d116", + x"e2552122", + x"e1009225", + x"2f1261f2", + x"31278d05", + x"e70061f2", x"71012f12", + x"aff70009", + x"d10e921a", + x"e555d618", + x"21222f72", + x"63f23367", + x"890463f2", + x"73012f32", x"aff80009", - x"da1a941c", - x"480be900", - x"2f9261f2", - x"31a78904", - x"61f27101", - x"2f12aff8", - x"0009480b", - x"e4552f92", - x"61f231a7", - x"890461f2", - x"71012f12", + x"21522f72", + x"63f23367", + x"890463f2", + x"73012f32", x"aff80009", - x"9405480b", - x"0009afe7", + x"2122afea", x"000900ff", x"031f00aa", - x"00001098", - x"0000138c", - x"00001064", - x"00001420", - x"00001640", - x"00001630", - x"000010e4", - x"00001128", - x"00001168", - x"00001440", - x"000010a4", + x"abcd0000", + x"000010c4", + x"000010c8", + x"000013f8", + x"00001608", + x"00001654", + x"00001134", + x"00001164", + x"000011a4", + x"00001418", + x"00001108", x"00124f7f", - x"d104644c", - x"5012c808", - x"8bfcd102", - x"1141000b", - x"00090009", - x"abcd0100", - x"d1035012", - x"c80189fc", - x"d1016012", - x"000b600c", - x"abcd0100", - x"d0062f86", - x"4f22400b", - x"0009d105", - x"6803410b", - x"64036083", - x"4f26000b", - x"68f60009", - x"00001344", - x"0000132c", - x"d102e202", - x"1123000b", - x"00090009", - x"abcd0100", - x"000b0009", x"4f000000", x"4f666673", x"65747300", @@ -1289,11 +1279,11 @@ package bootrom is x"00000006", x"00000007", x"00000007", - x"000013bc", - x"000013c4", - x"000013cc", - x"000013d4", - x"000013dc", + x"00001394", + x"0000139c", + x"000013a4", + x"000013ac", + x"000013b4", x"47444220", x"53747562", x"20666f72", @@ -1426,29 +1416,29 @@ package bootrom is x"20100000", x"00070507", x"00000032", - x"40a1c0a6", - x"a22ff800", - x"23811fac", - x"00afff00", x"72657669", x"73696f6e", x"3a206368", x"616e6765", x"7365743a", - x"20202031", - x"373a6234", - x"38333238", - x"33636263", - x"66300a62", + x"20202032", + x"343a3562", + x"35373966", + x"38323133", + x"39610a62", x"75696c64", - x"3a204d6f", - x"6e204d61", - x"72203138", - x"2031363a", - x"32313a35", - x"36204544", + x"3a205361", + x"74204d61", + x"72203330", + x"2030303a", + x"30343a33", + x"37204544", x"54203230", x"31390a00", + x"40a1c0a6", + x"a22ff800", + x"23811fac", + x"00afff00", others => x"00000000" ); end package; diff --git a/testrom/Makefile b/testrom/Makefile index 2b42305..fc87d0e 100644 --- a/testrom/Makefile +++ b/testrom/Makefile @@ -37,8 +37,8 @@ tests/libtests.a: $(TESTS_OBJS) @echo Built test library -main.elf: main_up5k_42s.o $(OBJS) tests/libtests.a - $(LD) $(LDFLAGS) main_up5k_42s.o $(OBJS) -Ltests -ltests $(LIBGCC) -o $@ +main.elf: $(OBJS) tests/libtests.a main_up5k_42s.o + $(LD) $(LDFLAGS) $(OBJS) main_up5k_42s.o -Ltests -ltests $(LIBGCC) -o $@ main.o: main.c $(CC) $(CFLAGS) -fno-inline -c $<