Skip to content

Cm/20220523 igrisp #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ziopio wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Cm/20220523 igrisp #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
229b56c
fdt: Add IGRiSP
c-mauderer Apr 11, 2022
9ac043c
libgrisp: Update for IGRiSP
c-mauderer May 23, 2022
ff677ad
demo: No WiFi on IGrisp
c-mauderer May 13, 2022
80174a7
iGRiSP: Add a DIO test command
c-mauderer Apr 11, 2022
bb27382
demo: Add PMOD RFID to IGRiSP
c-mauderer May 13, 2022
1b68e70
demo: Fix chip select for RFID
May 17, 2022
2df8273
Allow both Ethernet ports on IGRiSP
c-mauderer May 18, 2022
b7295b6
FDT: Use different name for SPI3GPIO group
c-mauderer May 25, 2022
bc92c9f
Workaround for missing python on MacOS
c-mauderer Jul 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@ bootstrap:
.PHONY: toolchain
#H Build and install the toolchain.
toolchain:
ifeq ($(UNAME),Darwin)
mkdir -p $(PREFIX)/bin
[ ! -e "$(PREFIX)/bin/python" ] && \
ln -s `which python3` $(PREFIX)/bin/python
endif
mkdir -p $(BUILD_LOGS)
rm -rf $(RSB)/rtems/build
cd $(RSB)/rtems && ../source-builder/sb-set-builder \
Expand Down
47 changes: 36 additions & 11 deletions demo/init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
#define IS_GRISP2 1
#endif

#include <grisp.h>
#ifdef IS_GRISP1
#include <bsp/i2c.h>
#include <grisp/pin-config.h>
Expand All @@ -69,6 +70,7 @@
#include "sd-card-test.h"
#include "1wire.h"
#include "pmod_rfid.h"
#include "pmod_dio.h"

#define STACK_SIZE_INIT_TASK (64 * 1024)
#define STACK_SIZE_SHELL (64 * 1024)
Expand All @@ -79,7 +81,6 @@
#define PRIO_WPA (RTEMS_MAXIMUM_PRIORITY - 1)

#define SPI_FDT_NAME "spi0"
#define SPI_BUS "/dev/spibus"

#define CMD_SPI_MAX_LEN 32

Expand Down Expand Up @@ -249,14 +250,30 @@ Init(rtems_task_argument arg)
assert(rv == 0);
#endif
#ifdef IS_GRISP2
rv = spi_bus_register_imx(SPI_BUS, SPI_FDT_NAME);
assert(rv == 0);
if (grisp_is_industrialgrisp()) {
/* Industrial GRiSP */
rv = spi_bus_register_imx(GRISP_SPI_DEVICE,
GRISP_INDUSTRIAL_SPI_ONBOARD_FDT_ALIAS);
assert(rv == 0);
rv = spi_bus_register_imx(GRISP_SPI_DEVICE "-pmod",
GRISP_INDUSTRIAL_SPI_PMOD_FDT_ALIAS);
assert(rv == 0);

rv = i2c_bus_register_imx(GRISP_I2C0_DEVICE,
GRISP_INDUSTRIAL_I2C_FDT_ALIAS);
assert(rv == 0);
} else {
/* GRiSP2 */
rv = spi_bus_register_imx(GRISP_SPI_DEVICE,
GRISP_SPI_FDT_ALIAS);
assert(rv == 0);

rv = i2c_bus_register_imx("/dev/i2c-1", "i2c0");
assert(rv == 0);
rv = i2c_bus_register_imx("/dev/i2c-1", "i2c0");
assert(rv == 0);

rv = i2c_bus_register_imx("/dev/i2c-2", "i2c1");
assert(rv == 0);
rv = i2c_bus_register_imx("/dev/i2c-2", "i2c1");
assert(rv == 0);
}
#endif /* IS_GRISP2 */

printf("Init EEPROM\n");
Expand Down Expand Up @@ -289,8 +306,11 @@ Init(rtems_task_argument arg)
grisp_init_dhcpcd(PRIO_DHCP);

grisp_led_set2(false, false, true);
sleep(3);
grisp_init_wpa_supplicant(wpa_supplicant_conf, PRIO_WPA, create_wlandev);
if (!grisp_is_industrialgrisp()) {
sleep(3);
grisp_init_wpa_supplicant(wpa_supplicant_conf, PRIO_WPA,
create_wlandev);
}

#ifdef EVENT_RECORDING
rtems_record_start_server(10, 1234, 10);
Expand All @@ -299,8 +319,13 @@ Init(rtems_task_argument arg)

init_led();
#ifdef IS_GRISP2
// uncomment for testing RFID
//pmod_rfid_init(SPI_BUS, 1);
if (grisp_is_industrialgrisp()) {
pmod_rfid_init(GRISP_SPI_DEVICE, 0);
pmod_dio_init(GRISP_SPI_DEVICE);
} else {
// uncomment for testing RFID
//pmod_rfid_init(GRISP_SPI_DEVICE, 1);
}
#endif /* IS_GRISP2 */
start_shell();

Expand Down
Loading