[PATCH 02/14] video: nokia_rx51: Drop obsolete video code

Pali Rohár pali at kernel.org
Sun Jan 23 15:08:20 CET 2022


+ Maemo

On Sunday 23 January 2022 07:04:03 Simon Glass wrote:
> Drop this code which uses a header that is about to be deleted.

And what / where is the replacement?

> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
> 
>  board/nokia/rx51/rx51.c      | 19 -------------------
>  configs/nokia_rx51_defconfig |  1 -
>  include/configs/nokia_rx51.h | 11 -----------
>  3 files changed, 31 deletions(-)
> 
> diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
> index 99ca36fbbea..45c569f83a3 100644
> --- a/board/nokia/rx51/rx51.c
> +++ b/board/nokia/rx51/rx51.c
> @@ -30,7 +30,6 @@
>  #include <malloc.h>
>  #include <twl4030.h>
>  #include <i2c.h>
> -#include <video_fb.h>
>  #include <asm/global_data.h>
>  #include <asm/io.h>
>  #include <asm/setup.h>
> @@ -61,8 +60,6 @@ struct emu_hal_params_rx51 {
>  
>  DECLARE_GLOBAL_DATA_PTR;
>  
> -GraphicDevice gdev;
> -
>  const omap3_sysinfo sysinfo = {
>  	DDR_STACKED,
>  	"Nokia RX-51",
> @@ -341,22 +338,6 @@ void setup_board_tags(struct tag **in_params)
>  	*in_params = params;
>  }
>  
> -/*
> - * Routine: video_hw_init
> - * Description: Set up the GraphicDevice depending on sys_boot.
> - */
> -void *video_hw_init(void)
> -{
> -	/* fill in Graphic Device */
> -	gdev.frameAdrs = 0x8f9c0000;
> -	gdev.winSizeX = 800;
> -	gdev.winSizeY = 480;
> -	gdev.gdfBytesPP = 2;
> -	gdev.gdfIndex = GDF_16BIT_565RGB;
> -	memset((void *)gdev.frameAdrs, 0, 0xbb800);
> -	return (void *) &gdev;
> -}
> -
>  /*
>   * Routine: twl4030_regulator_set_mode
>   * Description: Set twl4030 regulator mode over i2c powerbus.
> diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
> index 71b0b95c672..0ef5a84b3f3 100644
> --- a/configs/nokia_rx51_defconfig
> +++ b/configs/nokia_rx51_defconfig
> @@ -76,7 +76,6 @@ CONFIG_SPI=y
>  CONFIG_USB=y
>  CONFIG_USB_MUSB_UDC=y
>  CONFIG_USB_OMAP3=y
> -# CONFIG_VGA_AS_SINGLE_DEVICE is not set
>  CONFIG_SPLASH_SCREEN=y
>  CONFIG_WATCHDOG_TIMEOUT_MSECS=31000
>  CONFIG_WDT=y
> diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
> index adfc055a2c9..0163f3b9852 100644
> --- a/include/configs/nokia_rx51.h
> +++ b/include/configs/nokia_rx51.h
> @@ -70,17 +70,6 @@
>  
>  #define CONFIG_SYS_ONENAND_BASE		ONENAND_MAP
>  
> -/*
> - * Framebuffer
> - */
> -/* Video console */
> -#define VIDEO_FB_16BPP_PIXEL_SWAP
> -#define VIDEO_FB_16BPP_WORD_SWAP
> -
> -/* functions for cfb_console */
> -#define VIDEO_KBD_INIT_FCT		rx51_kp_init()
> -#define VIDEO_TSTC_FCT			rx51_kp_tstc
> -#define VIDEO_GETC_FCT			rx51_kp_getc
>  #ifndef __ASSEMBLY__
>  struct stdio_dev;
>  int rx51_kp_init(void);
> -- 
> 2.35.0.rc0.227.g00780c9af4-goog
> 


More information about the U-Boot mailing list