From 98f705c9cefdfdba62c069821bbba10273a0a8ed Mon Sep 17 00:00:00 2001 From: Heiko Schocher Date: Tue, 27 Jun 2017 16:49:14 +0200 Subject: powerpc: remove 4xx support There was for long time no activity in the 4xx area. We need to go further and convert to Kconfig, but it turned out, nobody is interested anymore in 4xx, so remove it. Signed-off-by: Heiko Schocher --- common/board_f.c | 3 -- common/fdt_support.c | 78 ---------------------------------------------------- common/lynxkdi.c | 45 ------------------------------ common/usb.c | 3 -- common/usb_hub.c | 3 -- 5 files changed, 132 deletions(-) (limited to 'common') diff --git a/common/board_f.c b/common/board_f.c index 850d19db750..2cdd12a503a 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -883,9 +883,6 @@ static const init_fnc_t init_sequence_f[] = { setup_board_part2, #endif display_new_sp, -#ifdef CONFIG_SYS_EXTBDINFO - setup_board_extra, -#endif #ifdef CONFIG_OF_BOARD_FIXUP fix_fdt, #endif diff --git a/common/fdt_support.c b/common/fdt_support.c index dfdc04dfbae..5aa8e3422e8 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -642,84 +642,6 @@ int fdt_pci_dma_ranges(void *blob, int phb_off, struct pci_controller *hose) { } #endif -#ifdef CONFIG_FDT_FIXUP_NOR_FLASH_SIZE -/* - * Provide a weak default function to return the flash bank size. - * There might be multiple non-identical flash chips connected to one - * chip-select, so we need to pass an index as well. - */ -u32 __flash_get_bank_size(int cs, int idx) -{ - extern flash_info_t flash_info[]; - - /* - * As default, a simple 1:1 mapping is provided. Boards with - * a different mapping need to supply a board specific mapping - * routine. - */ - return flash_info[cs].size; -} -u32 flash_get_bank_size(int cs, int idx) - __attribute__((weak, alias("__flash_get_bank_size"))); - -/* - * This function can be used to update the size in the "reg" property - * of all NOR FLASH device nodes. This is necessary for boards with - * non-fixed NOR FLASH sizes. - */ -int fdt_fixup_nor_flash_size(void *blob) -{ - char compat[][16] = { "cfi-flash", "jedec-flash" }; - int off; - int len; - struct fdt_property *prop; - u32 *reg, *reg2; - int i; - - for (i = 0; i < 2; i++) { - off = fdt_node_offset_by_compatible(blob, -1, compat[i]); - while (off != -FDT_ERR_NOTFOUND) { - int idx; - - /* - * Found one compatible node, so fixup the size - * int its reg properties - */ - prop = fdt_get_property_w(blob, off, "reg", &len); - if (prop) { - int tuple_size = 3 * sizeof(reg); - - /* - * There might be multiple reg-tuples, - * so loop through them all - */ - reg = reg2 = (u32 *)&prop->data[0]; - for (idx = 0; idx < (len / tuple_size); idx++) { - /* - * Update size in reg property - */ - reg[2] = flash_get_bank_size(reg[0], - idx); - - /* - * Point to next reg tuple - */ - reg += 3; - } - - fdt_setprop(blob, off, "reg", reg2, len); - } - - /* Move to next compatible node */ - off = fdt_node_offset_by_compatible(blob, off, - compat[i]); - } - } - - return 0; -} -#endif - int fdt_increase_size(void *fdt, int add_len) { int newlen; diff --git a/common/lynxkdi.c b/common/lynxkdi.c index 98560159fe3..f2b95ac8d37 100644 --- a/common/lynxkdi.c +++ b/common/lynxkdi.c @@ -22,49 +22,4 @@ DECLARE_GLOBAL_DATA_PTR; -#if defined(CONFIG_440EP) || defined(CONFIG_440GR) -void lynxkdi_boot(image_header_t *hdr) -{ - void (*lynxkdi)(void) = (void(*)(void))image_get_ep(hdr); - lynxos_bootparms_t *parms = (lynxos_bootparms_t *)0x0020; - bd_t *kbd; - u32 *psz = (u32 *)(image_get_load(hdr) + 0x0204); - - memset(parms, 0, sizeof(*parms)); - kbd = gd->bd; - parms->clock_ref = kbd->bi_busfreq; - parms->dramsz = kbd->bi_memsize; - eth_getenv_enetaddr("ethaddr", parms->ethaddr); - mtspr(SPRN_SPRG2, 0x0020); - - /* Do a simple check for Bluecat so we can pass the - * kernel command line parameters. - */ - /* FIXME: NOT SURE HERE ! */ - if (le32_to_cpu(*psz) == image_get_data_size(hdr)) { - char *args; - char *cmdline = (char *)(image_get_load(hdr) + 0x020c); - int len; - - printf("Booting Bluecat KDI ...\n"); - udelay(200*1000); /* Allow serial port to flush */ - if ((args = getenv("bootargs")) == NULL) - args = ""; - /* Prepend the cmdline */ - len = strlen(args); - if (len && (len + strlen(cmdline) + 2 < (0x0400 - 0x020c))) { - memmove(cmdline + strlen(args) + 1, cmdline, - strlen(cmdline)); - strcpy(cmdline, args); - cmdline[len] = ' '; - } - } - else { - printf("Booting LynxOS KDI ...\n"); - } - - lynxkdi(); -} -#else #error "Lynx KDI support not implemented for configured CPU" -#endif diff --git a/common/usb.c b/common/usb.c index 15e1e4c64e4..09042597573 100644 --- a/common/usb.c +++ b/common/usb.c @@ -37,9 +37,6 @@ #include #include #include -#ifdef CONFIG_4xx -#include -#endif #define USB_BUFSIZ 512 diff --git a/common/usb_hub.c b/common/usb_hub.c index ff9cd50eab7..d135526e4fe 100644 --- a/common/usb_hub.c +++ b/common/usb_hub.c @@ -40,9 +40,6 @@ DECLARE_GLOBAL_DATA_PTR; #include -#ifdef CONFIG_4xx -#include -#endif #define USB_BUFSIZ 512 -- cgit v1.3.1