From aab98f0429a51e843985277fe6b8094c08e1747f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Rivi=C3=A8re?= Date: Mon, 22 Oct 2012 18:15:01 +0000 Subject: [PATCH] Removed old FireTOS code. --- BaS_GNU/sources/BaS.c | 54 +++++++++++++++------------------------ BaS_GNU/sources/sysinit.c | 16 +++--------- 2 files changed, 25 insertions(+), 45 deletions(-) diff --git a/BaS_GNU/sources/BaS.c b/BaS_GNU/sources/BaS.c index cca2d15..b5d596f 100644 --- a/BaS_GNU/sources/BaS.c +++ b/BaS_GNU/sources/BaS.c @@ -39,44 +39,32 @@ void BaS(void) sd_card_idle(); } - /* copy tos */ - if (DIP_SWITCH & (1 << 6)) + /* Initialize the NVRAM */ + MCF_PSC3_PSCTB_8BIT = 'ACPF'; + wait_10ms(); + + MCF_PSC0_PSCTB_8BIT = 'PIC '; + + MCF_PSC0_PSCTB_8BIT = MCF_PSC3_PSCRB_8BIT; + MCF_PSC0_PSCTB_8BIT = MCF_PSC3_PSCRB_8BIT; + MCF_PSC0_PSCTB_8BIT = MCF_PSC3_PSCRB_8BIT; + MCF_PSC0_PSCTB_8BIT = 0x0d0a; + + MCF_PSC3_PSCTB_8BIT = 0x01; /* request RTC data */ + + if (MCF_PSC3_PSCRB_8BIT == 0x81) { - MCF_PSC3_PSCTB_8BIT = 'ACPF'; - wait_10ms(); - - MCF_PSC0_PSCTB_8BIT = 'PIC '; - - MCF_PSC0_PSCTB_8BIT = MCF_PSC3_PSCRB_8BIT; - MCF_PSC0_PSCTB_8BIT = MCF_PSC3_PSCRB_8BIT; - MCF_PSC0_PSCTB_8BIT = MCF_PSC3_PSCRB_8BIT; - MCF_PSC0_PSCTB_8BIT = 0x0d0a; - - MCF_PSC3_PSCTB_8BIT = 0x01; /* request RTC data */ - - if (MCF_PSC3_PSCRB_8BIT == 0x81) + for (i = 0; i < 64; i++) { - for (i = 0; i < 64; i++) - { - * (uint8_t *) 0xffff8963 = MCF_PSC3_PSCRB_8BIT; /* Copy the NVRAM data from the PIC to the FPGA */ - } - } - - /* copy EMUTOS */ - src = (uint8_t *) 0xe0600000L; - while (src < (uint8_t *) 0xe0700000L) - { - *dst++ = *src++; + * (uint8_t *) 0xffff8963 = MCF_PSC3_PSCRB_8BIT; /* Copy the NVRAM data from the PIC to the FPGA */ } } - else + + /* copy EMUTOS */ + src = (uint8_t *) 0xe0600000L; + while (src < (uint8_t *) 0xe0700000L) { - /* copy FireTOS */ - src = (uint8_t *) 0xe0400000L; - while (src < (uint8_t *) 0xe0500000L) - { - *dst++ = *src++; - } + *dst++ = *src++; } /* we have copied a code area, so flush the caches */ diff --git a/BaS_GNU/sources/sysinit.c b/BaS_GNU/sources/sysinit.c index 4d2d7c7..2ef8a73 100644 --- a/BaS_GNU/sources/sysinit.c +++ b/BaS_GNU/sources/sysinit.c @@ -709,22 +709,14 @@ void initialize_hardware(void) { init_slt(); init_fbcs(); init_ddram(); - - /* do not initialize PCI if DIP switch 5 = on */ - if (DIP_SWITCH & (1 << 6)) - init_PCI(); - + init_PCI(); init_fpga(); init_pll(); init_video_ddr(); dvi_on(); - - /* do not initialize ports if DIP switch 5 = on */ - if (DIP_SWITCH & (1 << 6)) { - test_upd720101(); - /* video_1280_1024(); */ - init_ac97(); - } + test_upd720101(); + //video_1280_1024(); + init_ac97(); /* copy the BaS code contained in flash to its final location */ src = (uint32_t *)BAS_LMA;