Remove nios-32 arch remnants
PATCH 1/1 Remove nios-32 arch remnants
nios-32 arch was removed back in 2010 (1117cbf). Code depending on its headers (nios.h, nios-io.h) can't possibly compile since then. As it wasn't fixed till now it is safe to remove.
Signed-off-by Vasili Galka <[email protected]>
--- board/altera/common/sevenseg.c | 204 ----------------------------------- board/altera/common/sevenseg.h | 126 --------------------- board/altera/nios2-generic/Makefile | 1 - board/psyent/common/AMDLV065D.c | 4 - 4 files changed, 0 insertions(+), 335 deletions(-) delete mode 100644 board/altera/common/sevenseg.c delete mode 100644 board/altera/common/sevenseg.h
board/altera/common/sevenseg.c deleted +0 -204
@@ -1,204 +0,0 @@ -/* -* (C) Copyright 2003, Li-Pro.Net <www.li-pro.net> -* Stephan Linz <[email protected]> -* -* SPDX-License-Identifier: GPL-2.0+ -* -* common/sevenseg.c -* -* NIOS PIO based seven segment led support functions -*/ - -#include <common.h> -#include <nios-io.h> - -#ifdef CONFIG_SEVENSEG - -#define SEVENDEG_MASK_DP ((SEVENSEG_DIGIT_DP << 8) | SEVENSEG_DIGIT_DP) - -#ifdef SEVENSEG_WRONLY /* emulate read access */ -#if (SEVENSEG_ACTIVE ==0 ) -static unsigned int sevenseg_portval = ~0 ; -#else -static unsigned int sevenseg_portval =0 ; -#endif -#endif - -static int sevenseg_init_done =0 ; - -static inline void __sevenseg_set_masked (unsigned int mask,int value) -{ - nios_pio_t *piop __attribute__((unused)) = (nios_pio_t*)SEVENSEG_BASE; - -#ifdef SEVENSEG_WRONLY /* emulate read access */ - -#if (SEVENSEG_ACTIVE ==0 ) -if (value) - sevenseg_portval &= ~mask; -else - sevenseg_portval |= mask; -#else -if (value) - sevenseg_portval |= mask; -else - sevenseg_portval &= ~mask; -#endif - - piop->data = sevenseg_portval; - -#else /* !SEVENSEG_WRONLY */ - -#if (SEVENSEG_ACTIVE ==0 ) -if (value) - piop->data &= ~mask; -else - piop->data |= mask; -#else -if (value) - piop->data |= mask; -else - piop->data &= ~mask; -#endif - -#endif /* SEVENSEG_WRONLY */ -} - -static inline void __sevenseg_toggle_masked (unsigned int mask) -{ -nios_pio_t *piop = (nios_pio_t *)SEVENSEG_BASE ; - -#ifdef SEVENSEG_WRONLY /* emulate read access */ - - sevenseg_portval ^= mask; - piop->data = sevenseg_portval; - -#else /* !SEVENSEG_WRONLY */ - - piop->data ^= mask; - -#endif /* SEVENSEG_WRONLY */ -} - -static inline void __sevenseg_set (unsigned int value) -{ - nios_pio_t *piop __attribute__((unused)) = (nios_pio_t*)SEVENSEG_BASE; - -#ifdef SEVENSEG_WRONLY /* emulate read access */ - -#if (SEVENSEG_ACTIVE ==0 ) - sevenseg_portval = (sevenseg_portval &SEVENDEG_MASK_DP ) - | ((~value) & (~SEVENDEG_MASK_DP )); -#else - sevenseg_portval = (sevenseg_portval &SEVENDEG_MASK_DP ) - | (value); -#endif - - piop->data = sevenseg_portval; - -#else /* !SEVENSEG_WRONLY */ - -#if (SEVENSEG_ACTIVE ==0 ) - piop->data = (piop->data &SEVENDEG_MASK_DP ) - | ((~value) & (~SEVENDEG_MASK_DP )); -#else - piop->data = (piop->data &SEVENDEG_MASK_DP ) - | (value); -#endif - -#endif /* SEVENSEG_WRONLY */ -} - -static inline void __sevenseg_init (void ) -{ - nios_pio_t *piop __attribute__((unused)) = (nios_pio_t*)SEVENSEG_BASE; - -__sevenseg_set (0 ); - -#ifndef SEVENSEG_WRONLY /* setup direction */ - - piop->direction |= mask; - -#endif /* SEVENSEG_WRONLY */ -} - - -void sevenseg_set (int value) -{ -unsigned char digits[] = { -SEVENSEG_DIGITS_0 , -SEVENSEG_DIGITS_1 , -SEVENSEG_DIGITS_2 , -SEVENSEG_DIGITS_3 , -SEVENSEG_DIGITS_4 , -SEVENSEG_DIGITS_5 , -SEVENSEG_DIGITS_6 , -SEVENSEG_DIGITS_7 , -SEVENSEG_DIGITS_8 , -SEVENSEG_DIGITS_9 , -SEVENSEG_DIGITS_A , -SEVENSEG_DIGITS_B , -SEVENSEG_DIGITS_C , -SEVENSEG_DIGITS_D , -SEVENSEG_DIGITS_E , -SEVENSEG_DIGITS_F - }; - -if (!sevenseg_init_done) { -__sevenseg_init (); - sevenseg_init_done++; - } - -switch (value &SEVENSEG_MASK_CTRL ) { - -case SEVENSEG_RAW : -__sevenseg_set ( ( - (digits[((value &SEVENSEG_MASK_VAL ) >>4 )] <<8 ) | - digits[((value &SEVENSEG_MASK_VAL ) &0xf )] ) ); -return ; -break ;/* paranoia */ - -case SEVENSEG_OFF : -__sevenseg_set (0 ); -__sevenseg_set_masked (SEVENDEG_MASK_DP ,0 ); -return ; -break ;/* paranoia */ - -case SEVENSEG_SET_DPL : -__sevenseg_set_masked (SEVENSEG_DIGIT_DP ,1 ); -return ; -break ;/* paranoia */ - -case SEVENSEG_SET_DPH : -__sevenseg_set_masked ((SEVENSEG_DIGIT_DP <<8 ),1 ); -return ; -break ;/* paranoia */ - -case SEVENSEG_RES_DPL : -__sevenseg_set_masked (SEVENSEG_DIGIT_DP ,0 ); -return ; -break ;/* paranoia */ - -case SEVENSEG_RES_DPH : -__sevenseg_set_masked ((SEVENSEG_DIGIT_DP <<8 ),0 ); -return ; -break ;/* paranoia */ - -case SEVENSEG_TOG_DPL : -__sevenseg_toggle_masked (SEVENSEG_DIGIT_DP ); -return ; -break ;/* paranoia */ - -case SEVENSEG_TOG_DPH : -__sevenseg_toggle_masked ((SEVENSEG_DIGIT_DP <<8 )); -return ; -break ;/* paranoia */ - -case SEVENSEG_LO : -case SEVENSEG_HI : -case SEVENSEG_STR : -default : -break ; - } -} - -#endif /* CONFIG_SEVENSEG */
board/altera/common/sevenseg.h deleted +0 -126
126 lines not on this page · raw message
board/altera/nios2-generic/Makefile +0 -1
@@ -9,5 +9,4 @@ obj-y := nios2-generic.o obj-$(CONFIG_CMD_IDE) += ../common/cfide.o obj-$(CONFIG_EPLED) += ../common/epled.o -obj-$(CONFIG_SEVENSEG) += ../common/sevenseg.o obj-y += text_base.o
board/psyent/common/AMDLV065D.c +0 -4
@@ -7,11 +7,7 @@#include <common.h> -#if defined(CONFIG_NIOS ) -#include <nios.h> -#else #include <asm/io.h> -#endif #define SECTSZ (64 * 1024)flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS ];
Signature · 1 line
1.7.9
Quoted 5 lines · Vasili Galka
nios-32 arch was removed back in 2010 (1117cbf). Code depending on its headers (
nios.h,nios-io.h) can't possibly compile since then. As it wasn't fixed till now it is safe to remove.Signed-off-by Vasili Galka <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140619/118923a1/attachment.pgp>