Skip to content

Commit

Permalink
Merge pull request #24 from brain-hackers/unify-2ndgen
Browse files Browse the repository at this point in the history
Unify 2nd generation models
  • Loading branch information
Sgch committed Nov 15, 2022
2 parents 7ac8a7a + 3ec2f45 commit 7837498
Show file tree
Hide file tree
Showing 20 changed files with 14 additions and 1,024 deletions.
16 changes: 5 additions & 11 deletions arch/arm/mach-imx/mxs/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,11 @@ config TARGET_PWSH7
select BOARD_EARLY_INIT_F

config TARGET_PWA7200
bool "Support PW-A7200"
select BOARD_EARLY_INIT_F

config TARGET_PWG4200
bool "Support PW-G4200"
select BOARD_EARLY_INIT_F

config TARGET_PWG5300
bool "Support PW-G5300"
bool "Support PW-A7200 series"
help
Compatible with:
PW-G4200, PW-G5200, PW-G5300, PW-A7200, PW-A7300, PW-A7400,
PW-A9100, PW-A9200, PW-A9300
select BOARD_EARLY_INIT_F

endchoice
Expand All @@ -105,7 +101,5 @@ source "board/sharp/pwsh5/Kconfig"
source "board/sharp/pwsh6/Kconfig"
source "board/sharp/pwsh7/Kconfig"
source "board/sharp/pwa7200/Kconfig"
source "board/sharp/pwg4200/Kconfig"
source "board/sharp/pwg5300/Kconfig"

endif
6 changes: 3 additions & 3 deletions board/sharp/common/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
config BRAIN_2G
bool
default y if TARGET_PWG4200 || TARGET_PWG5300 || TARGET_PWA7200
default y if TARGET_PWA7200

config BRAIN_3G_4G
bool
Expand All @@ -9,13 +9,13 @@ config BRAIN_3G_4G

config LCD_X
string "LCD resolution X"
default 480 if TARGET_PWG4200 || TARGET_PWG5300 || TARGET_PWA7200
default 480 if TARGET_PWA7200
default 800 if TARGET_PWSH1 || TARGET_PWSH2
default 854 if TARGET_PWSH3 || TARGET_PWSH4 || TARGET_PWSH5 || \
TARGET_PWSH6 || TARGET_PWSH7

config LCD_Y
string "LCD resolution Y"
default 320 if TARGET_PWG4200 || TARGET_PWG5300 || TARGET_PWA7200
default 320 if TARGET_PWA7200
default 480 if TARGET_PWSH1 || TARGET_PWSH2 || TARGET_PWSH3 || \
TARGET_PWSH4 || TARGET_PWSH5 || TARGET_PWSH6 || TARGET_PWSH7
2 changes: 1 addition & 1 deletion board/sharp/pwa7200/MAINTAINERS
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PW-A7200 BOARD
PW-A7200 BOARD series
M: Suguru Saito <sg.sgch07@gmail.com>
S: Maintained
F: board/sharp/pwa7200/
Expand Down
10 changes: 5 additions & 5 deletions board/sharp/pwa7200/README
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
SHARP Brain PW-A7200
SHARP Brain PW-A7200 series
====================

Supported for PW-A7200.
Supports for PW-A7200 series.

Files of the PW-A7200 port
Files of the PW-A7200 series port
--------------------------

arch/arm/cpu/arm926ejs/mxs/ - The CPU support code for the Freescale i.MX28
arch/arm/include/asm/arch-mxs/ - Header files for the Freescale i.MX28
board/sharp/pwa7200/ - PW-A7200 board specific files
include/configs/pwa7200.h - PW-A7200 configuration file
board/sharp/pwa7200/ - PW-A7200 series board specific files
include/configs/pwa7200.h - PW-A7200 series configuration file
17 changes: 0 additions & 17 deletions board/sharp/pwg4200/Kconfig

This file was deleted.

6 changes: 0 additions & 6 deletions board/sharp/pwg4200/MAINTAINERS

This file was deleted.

11 changes: 0 additions & 11 deletions board/sharp/pwg4200/Makefile

This file was deleted.

12 changes: 0 additions & 12 deletions board/sharp/pwg4200/README

This file was deleted.

Loading

0 comments on commit 7837498

Please sign in to comment.