From c67fab3f57a4bb9a84b3717e5768899f12d71516 Mon Sep 17 00:00:00 2001 From: dhewg Date: Mon, 4 May 2009 23:59:27 +0200 Subject: [PATCH] Revert "first starts of implementing compatibility with BC" This reverts commit de6f907bb4241763bfb09efe521385482f166abd. --- Makefile | 2 +- bc.c | 153 ------------------------------------------------------- memory.c | 9 ---- 3 files changed, 1 insertion(+), 163 deletions(-) delete mode 100644 bc.c diff --git a/Makefile b/Makefile index 47a3209..905b091 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ TARGET_BIN = armboot.bin OBJS = start.o main.o ipc.o vsprintf.o string.o gecko.o memory.o memory_asm.o \ utils_asm.o utils.o ff.o diskio.o sdhc.o powerpc_elf.o powerpc.o panic.o \ irq.o irq_asm.o exception.o exception_asm.o seeprom.o crypto.o nand.o \ - boot2.o bc.o ldhack.o sdmmc.o + boot2.o ldhack.o sdmmc.o include ../../common.mk diff --git a/bc.c b/bc.c deleted file mode 100644 index 3ae723e..0000000 --- a/bc.c +++ /dev/null @@ -1,153 +0,0 @@ -/* - mini - a Free Software replacement for the Nintendo/BroadOn IOS. - - BC support code - -Copyright (C) 2009 Haxx Enterprises - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 2. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ -#include "types.h" -#include "memory.h" -#include "powerpc.h" -#include "hollywood.h" -#include "utils.h" -#include "start.h" -#include "gecko.h" -#if 0 -void powerpc_upload_stub(u32 entry) -{ - u32 i; - - set32(HW_EXICTRL, EXICTRL_ENABLE_EXI); - - // lis r3, entry@h - write32(EXI_BOOT_BASE + 4 * 0, 0x3c600000 | entry >> 16); - // ori r3, r3, entry@l - write32(EXI_BOOT_BASE + 4 * 1, 0x60630000 | (entry & 0xffff)); - // mtsrr0 r3 - write32(EXI_BOOT_BASE + 4 * 2, 0x7c7a03a6); - // li r3, 0 - write32(EXI_BOOT_BASE + 4 * 3, 0x38600000); - // mtsrr1 r3 - write32(EXI_BOOT_BASE + 4 * 4, 0x7c7b03a6); - // rfi - write32(EXI_BOOT_BASE + 4 * 5, 0x4c000064); - - for (i = 6; i < 0x10; ++i) - write32(EXI_BOOT_BASE + 4 * i, 0); - - set32(HW_DIFLAGS, DIFLAGS_BOOT_CODE); - - gecko_printf("disabling EXI now...\n"); - clear32(HW_EXICTRL, EXICTRL_ENABLE_EXI); -} - -void powerpc_hang() -{ - clear32(HW_RESETS, 0x30); - udelay(100); - set32(HW_RESETS, 0x20); - udelay(100); -} - -void powerpc_reset() -{ - // enable the broadway IPC interrupt - write32(HW_PPCIRQMASK, (1<<30)); - clear32(HW_RESETS, 0x30); - udelay(100); - set32(HW_RESETS, 0x20); - udelay(100); - set32(HW_RESETS, 0x10); - udelay(100000); - set32(HW_EXICTRL, EXICTRL_ENABLE_EXI); -} -#endif -void toggle_ppc1_ppc2(void) -{ - u32 d = read32(HW_RESETS); - write32(HW_RESETS, d & ~0x30); - udelay(15); - write32(HW_RESETS, d & ~0x10); -} - -void clear_resets_i_l(void) -{ -} - -void clear_184_438e(void) -{ -} - -void hw_bus_freq_craps(void) -{ -} - -void call_init_dram(int r0, int r1) -{ -} - -void set_hwresets_i_l(void) -{ -} - -void clear_hwresets_i_l(void) -{ -} - -void set_184_438e(void) -{ -} - -void twiddle_dram_regs(int r0, int r1) -{ -} - -void bc_main(void) { - toggle_ppc1_ppc2(); - clear_hwresets_i_l(); - clear_184_438e(); - hw_bus_freq_craps(); - call_init_dram(1,0); - set_hwresets_i_l(); - set_184_438e(); - twiddle_dram_regs(1,1); - write32(HW_PPCIRQFLAG, 1 << 15); - udelay(200); - mem_setswap_bc(); -} -#if 0 -void powerpc_ipc(volatile ipc_request *req) -{ - switch (req->req) { - case IPC_PPC_BOOT: - if (req->args[0]) { - // Enqueued from ARM side, do not invalidate mem nor ipc_post - powerpc_boot_mem((u8 *) req->args[1], req->args[2]); - } else { - dc_invalidaterange((void *) req->args[1], req->args[2]); - int res = powerpc_boot_mem((u8 *) req->args[1], req->args[2]); - if (res) - ipc_post(req->code, req->tag, 1, res); - } - - break; - default: - gecko_printf("IPC: unknown SLOW PPC request %04X\n", req->req); - } -} - -#endif diff --git a/memory.c b/memory.c index 78a22eb..03fe3d3 100644 --- a/memory.c +++ b/memory.c @@ -272,15 +272,6 @@ void mem_setswap(int enable) write32(HW_MEMMIRR, d | 0x20); } -void mem_setswap_bc(void) -{ - u32 hw_vers = read32(HW_VERSION); - u32 memmirr = read32(HW_MEMMIRR); - gecko_printf("%s: hw_vers=%08x memmirr=%08x\n", hw_vers, memmirr); - if (hw_vers & 0xf0) write32(HW_MEMMIRR, 0x27); // hw major version > 0 - else write32(HW_MEMMIRR, 0x67); -} - u32 dma_addr(void *p) { u32 addr = (u32)p;