old nios arch removal
Subsystems (2)
Dear Scott,
The old nios arch is obsolete and the build has been broken for a long time. Shall we remove it from u-boot?
Best regards,
Thomas
Thomas,
Quoted 2 lines
The old nios arch is obsolete and the build has been broken for a long time. Shall we remove it from u-boot?
I'm in favor of removing the nios-32 code. It's been a very long time since I had a customer using nios-32 -- never mind nios-32 u-boot.
If nobody objects, let's get rid of it.
Regards,
--Scott
Quoted 5 lines · Scott McNutt
Thomas,
Quoted 2 lines
The old nios arch is obsolete and the build has been broken for a long time. Shall we remove it from u-boot?
Quoted 10 lines
I'm in favor of removing the nios-32 code. It's been a very long time since I had a customer using nios-32 -- never mind nios-32 u-boot.
If nobody objects, let's get rid of it.
Regards,
--Scott
Hi Scott,
Yes, the gcc2.9 of nios-32 is too old for current u-boot. I will prepare a branch for the removal on my git server, then you may pull it and verify. The patches might be too big to post entirely on the list.
Best regards,
Thomas
PATCH 1/1 nios: remove nios-32 arch
The nios-32 arch is obsolete and broken. So it is removed.
---
Deleted files are snipped.
The following changes since commit 01f03bda5b22e5aeae5f02fd537da97a41485c73:
Wolfgang Denk (1):
Prepare v2010.06-rc1
are available in the git repository at:
git://sopc.et.ntust.edu.tw/git/u-boot.git rm_nios32
MAINTAINERS | 16 - MAKEALL | 17 +- Makefile | 62 --- README | 7 +- arch/nios/config.mk | 29 -- arch/nios/cpu/Makefile | 48 --- arch/nios/cpu/asmi.c | 695 --------------------------------- arch/nios/cpu/config.mk | 24 -- arch/nios/cpu/cpu.c | 78 ---- arch/nios/cpu/interrupts.c | 196 --------- arch/nios/cpu/serial.c | 135 ------- arch/nios/cpu/spi.c | 195 --------- arch/nios/cpu/start.S | 238 ----------- arch/nios/cpu/traps.S | 582 --------------------------- arch/nios/include/asm/bitops.h | 38 -- arch/nios/include/asm/byteorder.h | 30 -- arch/nios/include/asm/cache.h | 1 - arch/nios/include/asm/config.h | 27 -- arch/nios/include/asm/global_data.h | 54 --- arch/nios/include/asm/io.h | 141 ------- arch/nios/include/asm/posix_types.h | 63 --- arch/nios/include/asm/processor.h | 1 - arch/nios/include/asm/psr.h | 28 -- arch/nios/include/asm/ptrace.h | 36 -- arch/nios/include/asm/status_led.h | 132 ------- arch/nios/include/asm/string.h | 25 -- arch/nios/include/asm/system.h | 4 - arch/nios/include/asm/types.h | 60 --- arch/nios/include/asm/u-boot.h | 48 --- arch/nios/lib/Makefile | 50 --- arch/nios/lib/board.c | 168 -------- arch/nios/lib/bootm.c | 34 -- arch/nios/lib/cache.c | 32 -- arch/nios/lib/divmod.c | 101 ----- arch/nios/lib/math.h | 16 - arch/nios/lib/mult.c | 56 --- arch/nios/lib/time.c | 38 -- board/altera/dk1c20/Makefile | 51 --- board/altera/dk1c20/config.mk | 29 -- board/altera/dk1c20/dk1c20.c | 93 ----- board/altera/dk1c20/flash.c | 62 --- board/altera/dk1c20/misc.c | 33 -- board/altera/dk1c20/u-boot.lds | 70 ---- board/altera/dk1c20/vectors.S | 123 ------ board/altera/dk1s10/Makefile | 51 --- board/altera/dk1s10/config.mk | 29 -- board/altera/dk1s10/dk1s10.c | 72 ---- board/altera/dk1s10/flash.c | 62 --- board/altera/dk1s10/misc.c | 33 -- board/altera/dk1s10/u-boot.lds | 70 ---- board/altera/dk1s10/vectors.S | 139 ------- board/ssv/adnpesc1/Makefile | 51 --- board/ssv/adnpesc1/adnpesc1.c | 103 ----- board/ssv/adnpesc1/config.mk | 29 -- board/ssv/adnpesc1/flash.c | 66 --- board/ssv/adnpesc1/misc.c | 40 -- board/ssv/adnpesc1/u-boot.lds | 70 ---- board/ssv/adnpesc1/vectors.S | 138 ------- board/ssv/common/cmd_sled.c | 162 -------- board/ssv/common/flash.c | 207 ---------- board/ssv/common/post.c | 44 -- board/ssv/common/wd_pio.c | 160 -------- common/cmd_bdinfo.c | 19 - common/cmd_bootm.c | 2 - common/image.c | 1 - config.mk | 8 - doc/README.adnpesc1 | 235 ----------- doc/README.adnpesc1_base32 | 469 ---------------------- doc/README.dk1c20 | 153 -------- doc/README.dk1c20_std32 | 366 ----------------- doc/README.dk1s10 | 131 ------ doc/README.dk1s10_mldk20 | 286 -------------- doc/README.dk1s10_std32 | 354 ----------------- doc/README.dk1s40_std32 | 355 ----------------- doc/README.dk20k200_std32 | 242 ------------ doc/README.nios | 366 ----------------- doc/README.nios_CONFIG_SYS_NIOS_CPU | 140 ------- doc/README.nios_DK | 192 --------- doc/uImage.FIT/source_file_format.txt | 3 +- examples/standalone/stubs.c | 17 - fs/fat/fat.c | 3 - include/configs/ADNPESC1.h | 689 -------------------------------- include/configs/ADNPESC1_base_32.h | 431 -------------------- include/configs/DK1C20.h | 555 -------------------------- include/configs/DK1C20_safe_32.h | 34 -- include/configs/DK1C20_standard_32.h | 279 ------------- include/configs/DK1S10.h | 561 -------------------------- include/configs/DK1S10_mtx_ldk_20.h | 187 --------- include/configs/DK1S10_safe_32.h | 34 -- include/configs/DK1S10_standard_32.h | 274 ------------- include/image.h | 5 - include/nios-io.h | 183 --------- include/nios.h | 77 ---- include/watchdog.h | 4 - 94 files changed, 4 insertions(+), 12143 deletions(-) delete mode 100644 arch/nios/config.mk delete mode 100644 arch/nios/cpu/Makefile delete mode 100644 arch/nios/cpu/asmi.c delete mode 100644 arch/nios/cpu/config.mk delete mode 100644 arch/nios/cpu/cpu.c delete mode 100644 arch/nios/cpu/interrupts.c delete mode 100644 arch/nios/cpu/serial.c delete mode 100644 arch/nios/cpu/spi.c delete mode 100644 arch/nios/cpu/start.S delete mode 100644 arch/nios/cpu/traps.S delete mode 100644 arch/nios/include/asm/bitops.h delete mode 100644 arch/nios/include/asm/byteorder.h delete mode 100644 arch/nios/include/asm/cache.h delete mode 100644 arch/nios/include/asm/config.h delete mode 100644 arch/nios/include/asm/global_data.h delete mode 100644 arch/nios/include/asm/io.h delete mode 100644 arch/nios/include/asm/posix_types.h delete mode 100644 arch/nios/include/asm/processor.h delete mode 100644 arch/nios/include/asm/psr.h delete mode 100644 arch/nios/include/asm/ptrace.h delete mode 100644 arch/nios/include/asm/status_led.h delete mode 100644 arch/nios/include/asm/string.h delete mode 100644 arch/nios/include/asm/system.h delete mode 100644 arch/nios/include/asm/types.h delete mode 100644 arch/nios/include/asm/u-boot.h delete mode 100644 arch/nios/lib/Makefile delete mode 100644 arch/nios/lib/board.c delete mode 100644 arch/nios/lib/bootm.c delete mode 100644 arch/nios/lib/cache.c delete mode 100644 arch/nios/lib/divmod.c delete mode 100644 arch/nios/lib/math.h delete mode 100644 arch/nios/lib/mult.c delete mode 100644 arch/nios/lib/time.c delete mode 100644 board/altera/dk1c20/Makefile delete mode 100644 board/altera/dk1c20/config.mk delete mode 100644 board/altera/dk1c20/dk1c20.c delete mode 100644 board/altera/dk1c20/flash.c delete mode 100644 board/altera/dk1c20/misc.c delete mode 100644 board/altera/dk1c20/u-boot.lds delete mode 100644 board/altera/dk1c20/vectors.S delete mode 100644 board/altera/dk1s10/Makefile delete mode 100644 board/altera/dk1s10/config.mk delete mode 100644 board/altera/dk1s10/dk1s10.c delete mode 100644 board/altera/dk1s10/flash.c delete mode 100644 board/altera/dk1s10/misc.c delete mode 100644 board/altera/dk1s10/u-boot.lds delete mode 100644 board/altera/dk1s10/vectors.S delete mode 100644 board/ssv/adnpesc1/Makefile delete mode 100644 board/ssv/adnpesc1/adnpesc1.c delete mode 100644 board/ssv/adnpesc1/config.mk delete mode 100644 board/ssv/adnpesc1/flash.c delete mode 100644 board/ssv/adnpesc1/misc.c delete mode 100644 board/ssv/adnpesc1/u-boot.lds delete mode 100644 board/ssv/adnpesc1/vectors.S delete mode 100644 board/ssv/common/cmd_sled.c delete mode 100644 board/ssv/common/flash.c delete mode 100644 board/ssv/common/post.c delete mode 100644 board/ssv/common/wd_pio.c delete mode 100644 doc/README.adnpesc1 delete mode 100644 doc/README.adnpesc1_base32 delete mode 100644 doc/README.dk1c20 delete mode 100644 doc/README.dk1c20_std32 delete mode 100644 doc/README.dk1s10 delete mode 100644 doc/README.dk1s10_mldk20 delete mode 100644 doc/README.dk1s10_std32 delete mode 100644 doc/README.dk1s40_std32 delete mode 100644 doc/README.dk20k200_std32 delete mode 100644 doc/README.nios delete mode 100644 doc/README.nios_CONFIG_SYS_NIOS_CPU delete mode 100644 doc/README.nios_DK delete mode 100644 include/configs/ADNPESC1.h delete mode 100644 include/configs/ADNPESC1_base_32.h delete mode 100644 include/configs/DK1C20.h delete mode 100644 include/configs/DK1C20_safe_32.h delete mode 100644 include/configs/DK1C20_standard_32.h delete mode 100644 include/configs/DK1S10.h delete mode 100644 include/configs/DK1S10_mtx_ldk_20.h delete mode 100644 include/configs/DK1S10_safe_32.h delete mode 100644 include/configs/DK1S10_standard_32.h delete mode 100644 include/nios-io.h delete mode 100644 include/nios.h
MAINTAINERS +0 -16
@@ -842,22 +842,6 @@ Stefan Roese <[email protected]> vct_xxx MIPS32 4Kc ######################################################################### -# Nios-32 Systems: # -# # -# Maintainer Name, Email Address # -# Board CPU # -######################################################################### - -Stephan Linz <[email protected]> - - DK1S10 Nios-32 - ADNPESC1 Nios-32 - -Scott McNutt <[email protected]> - - DK1C20 Nios-32 - -######################################################################### # Nios-II Systems: # # # # Maintainer Name, Email Address #
MAKEALL +1 -16
@@ -811,21 +811,6 @@ LIST_x86=" \ " ######################################################################### -## NIOS Systems -######################################################################### - -LIST_nios=" \ - ADNPESC1 \ - ADNPESC1_base_32 \ - ADNPESC1_DNPEVA2_base_32\ - DK1C20 \ - DK1C20_standard_32 \ - DK1S10 \ - DK1S10_standard_32 \ - DK1S10_mtx_ldk_20 \ -" - -######################################################################### ## Nios-II Systems #########################################################################
@@ -1017,7 +1002,7 @@ do |coldfire \ |microblaze \ |mips|mips_el \ - |nios|nios2 \ + |nios2 \ |ppc|powerpc|5xx|5xxx|512x|8xx|8220|824x|8260|83xx|85xx|86xx|4xx|7xx|74xx|TSEC \ |sh|sh2|sh3|sh4 \ |sparc \
Makefile +0 -62
68 lines not on this page · raw message
README +2 -5
@@ -177,9 +177,6 @@ Directory Hierarchy: /mips Files generic to MIPS architecture /cpu CPU specific files /lib Architecture specific library files - /nios Files generic to Altera NIOS architecture - /cpu CPU specific files - /lib Architecture specific library files /nios2 Files generic to Altera NIOS2 architecture /cpu CPU specific files /lib Architecture specific library files
@@ -3337,8 +3334,8 @@ details; basically, the header defines the following image properties: Currently supported: Linux, NetBSD, VxWorks, QNX, RTEMS, LynxOS, INTEGRITY). * Target CPU Architecture (Provisions for Alpha, ARM, AVR32, Intel x86, - IA64, MIPS, NIOS, PowerPC, IBM S390, SuperH, Sparc, Sparc 64 Bit; - Currently supported: ARM, AVR32, Intel x86, MIPS, NIOS, PowerPC). + IA64, MIPS, Nios II, PowerPC, IBM S390, SuperH, Sparc, Sparc 64 Bit; + Currently supported: ARM, AVR32, Intel x86, MIPS, Nios II, PowerPC). * Compression Type (uncompressed, gzip, bzip2) * Load Address * Entry Point
arch/nios/config.mk deleted +0 -0
common/cmd_bdinfo.c +0 -19
@@ -119,25 +119,6 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 0; } -#elif defined(CONFIG_NIOS )/* NIOS*/ - -int do_bdinfo (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]) -{ -bd_t *bd = gd->bd; - -print_num ("memstart" , (ulong )bd->bi_memstart); -print_lnum ("memsize" , (u64 )bd->bi_memsize); -print_num ("flashstart" , (ulong )bd->bi_flashstart); -print_num ("flashsize" , (ulong )bd->bi_flashsize); -print_num ("flashoffset" , (ulong )bd->bi_flashoffset); - -print_eth (0 ); -printf ("ip_addr = %pI4\n" , &bd->bi_ip_addr); -printf ("baudrate = %ld bps\n" , bd->bi_baudrate); - -return 0 ; -} -#elif defined(CONFIG_NIOS2)/* Nios-II */ int do_bdinfo (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[])
common/cmd_bootm.c +0 -2
@@ -174,8 +174,6 @@ void arch_preboot_os(void) __attribute__((weak, alias("__arch_preboot_os")));#define IH_INITRD_ARCH IH_ARCH_MICROBLAZE#elif defined(__mips__)#define IH_INITRD_ARCH IH_ARCH_MIPS -#elif defined(__nios__) -#define IH_INITRD_ARCH IH_ARCH_NIOS#elif defined(__nios2__)#define IH_INITRD_ARCH IH_ARCH_NIOS2#elif defined(__PPC__)
common/image.c +0 -1
@@ -84,7 +84,6 @@ static table_entry_t uimage_arch[] = { { IH_ARCH_MICROBLAZE, "microblaze", "MicroBlaze", }, { IH_ARCH_MIPS, "mips", "MIPS", }, { IH_ARCH_MIPS64, "mips64", "MIPS 64 Bit", }, - { IH_ARCH_NIOS, "nios", "NIOS", }, { IH_ARCH_NIOS2, "nios2", "NIOS II", }, { IH_ARCH_PPC, "powerpc", "PowerPC", }, { IH_ARCH_PPC, "ppc", "PowerPC", },
config.mk +0 -8
@@ -191,14 +191,6 @@ endif CFLAGS += $(call cc-option,-fno-stack-protector) -# avoid trigraph warnings while parsing pci.h (produced by NIOS gcc-2.9) -# this option have to be placed behind -Wall -- that's why it is here -ifeq ($(ARCH),nios) -ifeq ($(findstring 2.9,$(shell $(CC) --version)),2.9) -CFLAGS := $(CPPFLAGS) -Wall -Wno-trigraphs -endif -endif - # $(CPPFLAGS) sets -g, which causes gcc to pass a suitable -g<format> # option to the assembler. AFLAGS_DEBUG :=
doc/uImage.FIT/source_file_format.txt +1 -2
@@ -173,8 +173,7 @@ the '/images' node should have the following layout: - arch : Architecture name, mandatory for types: "standalone", "kernel", "firmware", "ramdisk" and "fdt". Valid architecture names are: "alpha", "arm", "i386", "ia64", "mips", "mips64", "ppc", "s390", "sh", "sparc", - "sparc64", "m68k", "nios", "microblaze", "nios2", "blackfin", "avr32", - "st200". + "sparc64", "m68k", "microblaze", "nios2", "blackfin", "avr32", "st200". - entry : entry point address, address size is determined by '#address-cells' property of the root node. Mandatory for for types: "standalone" and "kernel".
examples/standalone/stubs.c +0 -17
@@ -65,23 +65,6 @@ gd_t *global_data; " lw $25, %1($25)\n" \ " jr $25\n" \ : : "i"(offsetof(gd_t, jt)), "i"(XF_ ## x * sizeof(void *)) : "t9"); -#elif defined(CONFIG_NIOS ) -/* -* %g7 holds the pointer to the global_data. %g0 is call clobbered. -*/ -#define EXPORT_FUNC (x) \ - asm volatile ( \ -" .globl " #x "\n" \ -#x ":\n" \ -" pfx %%hi(%0)\n" \ -" movi %%g0, %%lo(%0)\n" \ -" add %%g0, %%g7\n" \ -" ld %%g0, [%%g0]\n" \ -" pfx %1\n" \ -" ld %%g0, [%%g0]\n" \ -" jmp %%g0\n" \ -" nop \n" \ - : : "i"(offsetof(gd_t, jt)), "i"(XF_ ## x) : "r0");#elif defined(CONFIG_NIOS2 )/* * r15 holds the pointer to the global_data, r8 is call-clobbered
fs/fat/fat.c +0 -3
@@ -708,18 +708,6 @@ long do_fat_read (const char *filename, void *buffer, unsigned long maxsize, int dols) { -#if CONFIG_NIOS /* NIOS CPU cannot access big automatic arrays */ - static -#endif char fnamecopy[2048];boot_sector bs;volume_info volinfo;
include/image.h +0 -5
@@ -100,7 +100,6 @@#define IH_ARCH_SPARC 10/* Sparc */ #define IH_ARCH_SPARC64 11/* Sparc 64 Bit */ #define IH_ARCH_M68K 12/* M68K */ -#define IH_ARCH_NIOS 13/* Nios-32 */ #define IH_ARCH_MICROBLAZE 14/* MicroBlaze */ #define IH_ARCH_NIOS2 15/* Nios-II */ #define IH_ARCH_BLACKFIN 16/* Blackfin */
@@ -493,8 +492,6 @@ static inline int image_check_target_arch (const image_header_t *hdr) if (!image_check_arch (hdr, IH_ARCH_MICROBLAZE))#elif defined(__mips__) if (!image_check_arch (hdr, IH_ARCH_MIPS)) -#elif defined(__nios__) - if (!image_check_arch (hdr, IH_ARCH_NIOS))#elif defined(__nios2__) if (!image_check_arch (hdr, IH_ARCH_NIOS2))#elif defined(__PPC__)
@@ -647,8 +644,6 @@ static inline int fit_image_check_target_arch (const void *fdt, int node) if (!fit_image_check_arch (fdt, node, IH_ARCH_MICROBLAZE))#elif defined(__mips__) if (!fit_image_check_arch (fdt, node, IH_ARCH_MIPS)) -#elif defined(__nios__) - if (!fit_image_check_arch (fdt, node, IH_ARCH_NIOS))#elif defined(__nios2__) if (!fit_image_check_arch (fdt, node, IH_ARCH_NIOS2))#elif defined(__PPC__)
include/nios-io.h deleted +0 -0
include/watchdog.h +0 -4
@@ -31,10 +31,6 @@# error "Configuration error: CONFIG_HW_WATCHDOG and CONFIG_WATCHDOG can't be used together."#endif -#if defined(__ASSEMBLY__) && defined(__NIOS__) -# error "Configuration error: WATCHDOG_RESET inside assembler not supported for Nios platforms." -#endif -/* * Hardware watchdog */
Signature · 1 line
1.7.1.86.g0e460