Chameleon

Chameleon Commit Details

Date:2010-10-11 18:21:08 (13 years 6 months ago)
Author:Azimutz
Commit:586
Parents: 585
Message:Modules: ld no longer tries to flatten dependancies (rev 572). Adding missed code from rev 517.
Changes:
M/branches/azimutz/Chazi/i386/modules/Memory/dram_controllers.c
M/branches/azimutz/Chazi/i386/modules/KernelPatcher/Makefile
M/branches/azimutz/Chazi/i386/modules/Memory/Makefile
M/branches/azimutz/Chazi/i386/modules/Symbols/Makefile
M/branches/azimutz/Chazi/i386/modules/GraphicsEnabler/Makefile
M/branches/azimutz/Chazi/i386/modules/HelloWorld/Makefile

File differences

branches/azimutz/Chazi/i386/modules/KernelPatcher/Makefile
6363
6464
6565
66
67
66
67
6868
6969
7070
␊
␊
dylib: ${OBJS}␊
␉ld -flat_namespace -arch i386 \␊
␉-undefined suppress \␊
␉ld -arch i386 \␊
␉-undefined dynamic_lookup \␊
␉-alias $(MODULE_START) start \␊
␉-dylib -read_only_relocs suppress \␊
␉-S -x -dead_strip_dylibs \␊
branches/azimutz/Chazi/i386/modules/Memory/dram_controllers.c
533533
534534
535535
536
537
538
536
537
538
539
540
539541
540542
541
542
543
544
543
544
545
546
545547
546548
547
549
548550
549551
550
552
551553
552554
553555
554
555
556
557
558
559
560
561
562
556
557
558
559
560
561
562
563
564
565
void scan_dram_controller(pci_dt_t *dram_dev)␊
{␊
␉int i;␊
␉for(i = 1; i < sizeof(dram_controllers) / sizeof(dram_controllers[0]); i++)␊
␉if ((dram_controllers[i].vendor == dram_dev->vendor_id) ␊
␉␉␉␉&& (dram_controllers[i].device == dram_dev->device_id))␊
␉␊
␉for (i = 1; i <␉sizeof(dram_controllers) / sizeof(dram_controllers[0]); i++)␊
␉{␊
␉␉if ((dram_controllers[i].vendor == dram_dev->vendor_id) &&␊
␉␉␉(dram_controllers[i].device == dram_dev->device_id))␊
␉␉{␊
␉␉␉verbose("%s%s DRAM Controller [%4x:%4x] at %02x:%02x.%x\n", ␊
␉␉␉␉␉␉(dram_dev->vendor_id == 0x8086) ? "Intel " : "" ,␊
␉␉␉␉␉␉dram_controllers[i].name, dram_dev->vendor_id, dram_dev->device_id,␊
␉␉␉␉␉␉dram_dev->dev.bits.bus, dram_dev->dev.bits.dev, dram_dev->dev.bits.func);␊
␉␉␉␊
␉␉␉␉␉(dram_dev->vendor_id == 0x8086) ? "Intel " : "" ,␊
␉␉␉␉␉dram_controllers[i].name, dram_dev->vendor_id, dram_dev->device_id,␊
␉␉␉␉␉dram_dev->dev.bits.bus, dram_dev->dev.bits.dev, dram_dev->dev.bits.func);␊
␊
␉␉␉if (dram_controllers[i].initialise != NULL)␊
␉␉␉␉dram_controllers[i].initialise(dram_dev);␊
␉␉␉␉␉␉␉␊
␊
␉␉␉if (dram_controllers[i].poll_timings != NULL)␊
␉␉␉␉dram_controllers[i].poll_timings(dram_dev);␊
␉␉␉␉␉␉␉␉␊
␊
␉␉␉if (dram_controllers[i].poll_speed != NULL)␊
␉␉␉␉dram_controllers[i].poll_speed(dram_dev);␊
␊
␉␉␉verbose("Frequency detected: %d MHz (%d) %s Channel %d-%d-%d-%d\n", ␊
␉␉␉␉␉␉(uint32_t)Platform.RAM.Frequency / 1000000,␊
␉␉␉␉␉␉(uint32_t)Platform.RAM.Frequency / 500000,␊
␉␉␉␉␉␉memory_channel_types[Platform.RAM.Channels],␊
␉␉␉␉␉␉Platform.RAM.CAS, Platform.RAM.TRC, Platform.RAM.TRP, Platform.RAM.RAS␊
␉␉␉␉ );␊
␉␉␉␊
␉␉}␉␊
}␉␊
␉␉␉verbose("Frequency detected: %d MHz (%d) %s Channel \n\tCAS:%d tRC:%d tRP:%d RAS:%d (%d-%d-%d-%d)\n", ␊
␉␉␉␉␉(uint32_t)Platform.RAM.Frequency / 1000000,␊
␉␉␉␉␉(uint32_t)Platform.RAM.Frequency / 500000,␊
␉␉␉␉␉memory_channel_types[Platform.RAM.Channels],␊
␉␉␉␉␉Platform.RAM.CAS, Platform.RAM.TRC, Platform.RAM.TRP, Platform.RAM.RAS,␊
␉␉␉␉␉Platform.RAM.CAS, Platform.RAM.TRC, Platform.RAM.TRP, Platform.RAM.RAS);␊
␉␉␉//getc();␊
␉␉}␊
␉}␊
}␊
branches/azimutz/Chazi/i386/modules/Memory/Makefile
6363
6464
6565
66
67
66
67
6868
6969
7070
␊
␊
dylib: ${GRAPHICS_ENABLER_OBJS}␊
␉ld -flat_namespace -arch i386 \␊
␉-undefined suppress \␊
␉ld -arch i386 \␊
␉-undefined dynamic_lookup \␊
␉-alias $(MODULE_START) start \␊
␉-dylib -read_only_relocs suppress \␊
␉-S -x -Z -dead_strip_dylibs \␊
branches/azimutz/Chazi/i386/modules/Symbols/Makefile
5757
5858
5959
60
61
60
61
6262
6363
6464
␊
␊
dylib: $(OBJS)␊
␉ld -flat_namespace -arch i386 \␊
␉-undefined suppress \␊
␉ld -arch i386 \␊
␉-undefined dynamic_lookup \␊
␉-alias $(MODULE_START) start \␊
␉-dylib -read_only_relocs suppress \␊
␉-S -x -dead_strip_dylibs \␊
branches/azimutz/Chazi/i386/modules/GraphicsEnabler/Makefile
6363
6464
6565
66
67
66
67
6868
6969
7070
␊
␊
dylib: ${GRAPHICS_ENABLER_OBJS}␊
␉ld -flat_namespace -arch i386 \␊
␉-undefined suppress \␊
␉ld -arch i386 \␊
␉-undefined dynamic_lookup \␊
␉-alias $(MODULE_START) start \␊
␉-dylib -read_only_relocs suppress \␊
␉-S -x -Z -dead_strip_dylibs \␊
branches/azimutz/Chazi/i386/modules/HelloWorld/Makefile
6363
6464
6565
66
67
66
67
6868
6969
7070
␊
␊
dylib: ${HELLO_WORLD_OBJS}␊
␉ld -flat_namespace -arch i386 \␊
␉-undefined suppress \␊
␉ld -arch i386 \␊
␉-undefined dynamic_lookup \␊
␉-alias $(MODULE_START) start \␊
␉-dylib -read_only_relocs suppress \␊
␉-S -x -Z -dead_strip_dylibs \␊

Archive Download the corresponding diff file

Revision: 586