Skip to content

Commit 6d8b104

Browse files
committed
os/drivers/lcd: Remove LCD logo configuration
We replace logo with splash image. So we don't need to use LCD logo anymore. Remove LCD logo configuration options from Kconfig and defconfig and related code. Delete lcd_logo_52_340.c file. Signed-off-by: seokhun-eom <[email protected]>
1 parent 1028202 commit 6d8b104

File tree

6 files changed

+47
-112
lines changed

6 files changed

+47
-112
lines changed

build/configs/rtl8730e/loadable_ext_ddr/defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -631,8 +631,6 @@ CONFIG_LCD_ST7701SN=y
631631
# CONFIG_LCD_ST7789 is not set
632632
CONFIG_LCD_XRES=480
633633
CONFIG_LCD_YRES=800
634-
CONFIG_LCD_LOGO=y
635-
CONFIG_LCD_LOGO_52_340=y
636634
CONFIG_LCD_SEND_CMD_RETRY_COUNT=3
637635
CONFIG_LCD_LANDSCAPE=y
638636
# CONFIG_LCD_PORTRAIT is not set

os/drivers/lcd/Kconfig

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -201,27 +201,6 @@ config LCD_YRES
201201
---help---
202202
Specifies the Y resolution of the LCD.
203203

204-
config LCD_LOGO
205-
bool "Lcd screen image shown at boot time"
206-
default n
207-
---help---
208-
This screen image is shown at boot time.
209-
This image is shown till App makes first rendering call.
210-
211-
if LCD_LOGO
212-
choice
213-
prompt "LCD Bootup image"
214-
default LCD_LOGO_52_340
215-
---help---
216-
Select the bootup image to show on the LCD.
217-
218-
config LCD_LOGO_52_340
219-
bool "Logo 52x340"
220-
---help---
221-
LCD logo with resolution 52x340.
222-
endchoice
223-
endif
224-
225204
if LCD_INTERFACE_MIPI
226205
config LCD_SEND_CMD_RETRY_COUNT
227206
int "LCD send cmd retry count"

os/drivers/lcd/Make.defs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,6 @@ ifeq ($(CONFIG_LCD_ST7701SN),y)
118118
CSRCS += st7701sn.c
119119
endif
120120

121-
ifeq ($(CONFIG_LCD_LOGO_52_340),y)
122-
CSRCS += lcd_logo_52_340.c
123-
endif
124-
125121
DEPPATH += --dep-path lcd
126122
VPATH += :lcd
127123
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)lcd}

os/drivers/lcd/lcd_logo.h

Lines changed: 47 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,47 @@
1-
/****************************************************************************
2-
*
3-
* Copyright 2024 Samsung Electronics All Rights Reserved.
4-
*
5-
* Licensed under the Apache License, Version 2.0 (the "License");
6-
* you may not use this file except in compliance with the License.
7-
* You may obtain a copy of the License at
8-
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
16-
*
17-
****************************************************************************/
18-
19-
#ifndef __DRIVER_LCD_LOGO_H
20-
#define __DRIVER_LCD_LOGO_H
21-
22-
#include <tinyara/config.h>
23-
24-
#define LCD_BLACK_VAL 0
25-
#ifdef CONFIG_LCD_LOGO_52_340
26-
#define LOGO_XRES 52
27-
#define LOGO_YRES 340
28-
#else
29-
#define LOGO_XRES 0
30-
#define LOGO_YRES 0
31-
#endif /* CONFIG_LCD_LOGO_52_340 */
32-
#pragma pack(push, 1)
33-
typedef struct {
34-
uint16_t signature;
35-
uint32_t file_size;
36-
uint16_t reserved1;
37-
uint16_t reserved2;
38-
uint32_t data_offset;
39-
} bmp_header_t;
40-
41-
typedef struct {
42-
uint32_t header_size;
43-
int32_t width;
44-
int32_t height;
45-
uint16_t planes;
46-
uint16_t bits_per_pixel;
47-
uint32_t compression;
48-
uint32_t image_size;
49-
int32_t x_pixels_per_meter;
50-
int32_t y_pixels_per_meter;
51-
uint32_t colors_used;
52-
uint32_t colors_important;
53-
} bmp_info_header_t;
54-
#pragma pack(pop)
55-
#endif /* __DRIVER_LCD_LOGO_H */
56-
1+
/****************************************************************************
2+
*
3+
* Copyright 2024 Samsung Electronics All Rights Reserved.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*
17+
****************************************************************************/
18+
19+
#ifndef __DRIVER_LCD_LOGO_H
20+
#define __DRIVER_LCD_LOGO_H
21+
22+
#include <tinyara/config.h>
23+
24+
#pragma pack(push, 1)
25+
typedef struct {
26+
uint16_t signature;
27+
uint32_t file_size;
28+
uint16_t reserved1;
29+
uint16_t reserved2;
30+
uint32_t data_offset;
31+
} bmp_header_t;
32+
33+
typedef struct {
34+
uint32_t header_size;
35+
int32_t width;
36+
int32_t height;
37+
uint16_t planes;
38+
uint16_t bits_per_pixel;
39+
uint32_t compression;
40+
uint32_t image_size;
41+
int32_t x_pixels_per_meter;
42+
int32_t y_pixels_per_meter;
43+
uint32_t colors_used;
44+
uint32_t colors_important;
45+
} bmp_info_header_t;
46+
#pragma pack(pop)
47+
#endif /* __DRIVER_LCD_LOGO_H */

os/drivers/lcd/lcd_logo_52_340.c

Lines changed: 0 additions & 27 deletions
This file was deleted.

os/drivers/lcd/mipi_lcd.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ typedef enum lcd_mode_e lcd_mode_t;
5656
#define CONFIG_LCD_SEND_VENDOR_ID_CMD_RETRY_COUNT 3
5757
#endif
5858

59-
extern const uint8_t lcd_logo_raw_data[]; // Buffer containing only logo
60-
6159
#if defined(CONFIG_LCD_SW_ROTATION)
6260
#define NUM_OF_LCD_BUFFER 2
6361
static uint8_t *lcd_buffer[NUM_OF_LCD_BUFFER] = { NULL, NULL }; //Two lcd buffers to avoid screen tearing

0 commit comments

Comments
 (0)