Skip to content

Commit 4a83fc0

Browse files
committed
gncc gc2: remove deprecated gpio settings from env, sort defconfig entries
1 parent 607d49c commit 4a83fc0

File tree

11 files changed

+20
-50
lines changed

11 files changed

+20
-50
lines changed
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
11
gpio_button=14
22
gpio_default=6O 7o 14i 16O 17O 18O 34O 35O 49i 50o 57i 58i
3-
gpio_mmc_cd=49
4-
gpio_scl=58i
5-
gpio_sda=57i
6-
gpio_speaker=7o
7-
gpio_wlan=6O
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# NAME: GNCC GC2 (T23N, SC2336, ATBM6012BX)
22
# FRAG: soc-xburst1 toolchain-xburst1 ccache brand rootfs kernel system target uboot ssl
3+
BR2_PACKAGE_THINGINO_KOPT_MMC0=y
4+
BR2_PACKAGE_THINGINO_KOPT_MMC0_1BIT=y
35
BR2_PACKAGE_WIFI=y
46
BR2_PACKAGE_WIFI_ATBM6012BX=y
57
BR2_SENSOR_1_NAME="sc2336"
68
BR2_SOC_INGENIC_T23N=y
7-
BR2_PACKAGE_THINGINO_KOPT_MMC0=y
8-
BR2_PACKAGE_THINGINO_KOPT_MMC0_1BIT=y
99
BR2_THINGINO_AUDIO=y
10+
BR2_THINGINO_AUDIO_GPIO=7
11+
BR2_THINGINO_AUDIO_GPIO_LOW=y
1012
BR2_THINGINO_BUTTON=y
1113
BR2_THINGINO_SDCARD=y
1214
FLASH_SIZE_MB=8
13-
BR2_THINGINO_AUDIO_GPIO=7
14-
BR2_THINGINO_AUDIO_GPIO_LOW=y

configs/cameras/gncc_gc2_t23n_sc2336_atbm6012bx/thingino-camera.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
"mmc_cd": 49,
1515
"scl": "58i",
1616
"sda": "57i",
17-
"wlan": {
18-
"pin": 6,
19-
"active_low": false
20-
}
17+
"wlan": 6
2118
}
22-
}
19+
}
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
11
gpio_button=14
22
gpio_default=6O 7o 14i 16O 17O 18O 34O 35O 49i 50o 57i 58i
3-
gpio_mmc_cd=49
4-
gpio_scl=58i
5-
gpio_sda=57i
6-
gpio_speaker=7o
7-
gpio_wlan=6O
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# NAME: GNCC GC2 (T23N, SC2336P, ATBM6012BX)
22
# FRAG: soc-xburst1 toolchain-xburst1 ccache brand rootfs kernel system target uboot ssl
3+
BR2_PACKAGE_THINGINO_KOPT_MMC0=y
4+
BR2_PACKAGE_THINGINO_KOPT_MMC0_1BIT=y
35
BR2_PACKAGE_WIFI=y
46
BR2_PACKAGE_WIFI_ATBM6012BX=y
57
BR2_SENSOR_1_NAME="sc2336p"
68
BR2_SOC_INGENIC_T23N=y
7-
BR2_PACKAGE_THINGINO_KOPT_MMC0=y
8-
BR2_PACKAGE_THINGINO_KOPT_MMC0_1BIT=y
99
BR2_THINGINO_AUDIO=y
10+
BR2_THINGINO_AUDIO_GPIO=7
11+
BR2_THINGINO_AUDIO_GPIO_LOW=y
1012
BR2_THINGINO_BUTTON=y
1113
BR2_THINGINO_SDCARD=y
1214
FLASH_SIZE_MB=8
13-
BR2_THINGINO_AUDIO_GPIO=7
14-
BR2_THINGINO_AUDIO_GPIO_LOW=y

configs/cameras/gncc_gc2_t23n_sc2336p_atbm6012bx/thingino-camera.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
"mmc_cd": 49,
1515
"scl": "58i",
1616
"sda": "57i",
17-
"wlan": {
18-
"pin": 6,
19-
"active_low": false
20-
}
17+
"wlan": 6
2118
}
22-
}
19+
}
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
11
gpio_button=14
22
gpio_default=6O 7o 14i 16O 17O 18O 34O 35O 49i 50o 57i 58i
3-
gpio_mmc_cd=49
4-
gpio_scl=58i
5-
gpio_sda=57i
6-
gpio_speaker=7o
7-
gpio_wlan=6O
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# NAME: GNCC GC2 (T23N, SC3332, ATBM6012BX)
22
# FRAG: soc-xburst1 toolchain-xburst1 ccache brand rootfs kernel system target uboot ssl
3+
BR2_PACKAGE_THINGINO_KOPT_MMC0=y
4+
BR2_PACKAGE_THINGINO_KOPT_MMC0_1BIT=y
35
BR2_PACKAGE_WIFI=y
46
BR2_PACKAGE_WIFI_ATBM6012BX=y
57
BR2_SENSOR_1_NAME="sc3332"
68
BR2_SOC_INGENIC_T23N=y
7-
BR2_PACKAGE_THINGINO_KOPT_MMC0=y
8-
BR2_PACKAGE_THINGINO_KOPT_MMC0_1BIT=y
99
BR2_THINGINO_AUDIO=y
10+
BR2_THINGINO_AUDIO_GPIO=7
11+
BR2_THINGINO_AUDIO_GPIO_LOW=y
1012
BR2_THINGINO_BUTTON=y
1113
BR2_THINGINO_SDCARD=y
1214
FLASH_SIZE_MB=8
13-
BR2_THINGINO_AUDIO_GPIO=7
14-
BR2_THINGINO_AUDIO_GPIO_LOW=y

configs/cameras/gncc_gc2_t23n_sc3332_atbm6012bx/thingino-camera.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
"mmc_cd": 49,
1515
"scl": "58i",
1616
"sda": "57i",
17-
"wlan": {
18-
"pin": 6,
19-
"active_low": false
20-
}
17+
"wlan": 6
2118
}
22-
}
19+
}
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
gpio_button=14
22
gpio_default=6O 7O 8o 9O 10o 11o 14I 18O 42o 43o 49i 50o
3-
gpio_mmc_cd=49
4-
gpio_speaker=7o
5-
gpio_wlan=6O

0 commit comments

Comments
 (0)