Skip to content

[bsp/allwinner]update allwinnter libraries object file path #7482

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

Merged
BernardXiong merged 1 commit into from
May 12, 2023
Merged

[bsp/allwinner]update allwinnter libraries object file path #7482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions bsp/allwinner/d1/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ d1_library = 'sunxi-hal'
rtconfig.BSP_LIBRARY_TYPE = d1_library

# include libraries
objs.extend(SConscript(os.path.join(libraries_path_prefix, d1_library, 'SConscript')))
objs.extend(SConscript(os.path.join(libraries_path_prefix, d1_library, 'SConscript'), variant_dir='build/libraries/sunxi-hal', duplicate=0))

# include drivers
objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript')))
objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript'), variant_dir='build/libraries/drivers', duplicate=0))

# include libos
objs.extend(SConscript(os.path.join(libraries_path_prefix, 'libos', 'SConscript')))
objs.extend(SConscript(os.path.join(libraries_path_prefix, 'libos', 'SConscript'), variant_dir='build/libraries/libos', duplicate=0))

stack_size = 4096

Expand Down
6 changes: 3 additions & 3 deletions bsp/allwinner/d1s/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ hal_library = 'sunxi-hal'
rtconfig.BSP_LIBRARY_TYPE = hal_library

# include libraries
objs.extend(SConscript(os.path.join(libraries_path_prefix, hal_library, 'SConscript')))
objs.extend(SConscript(os.path.join(libraries_path_prefix, hal_library, 'SConscript'), variant_dir='build/libraries/sunxi-hal', duplicate=0))

# include drivers
objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript')))
objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript'), variant_dir='build/libraries/drivers', duplicate=0))

# include libos
objs.extend(SConscript(os.path.join(libraries_path_prefix, 'libos', 'SConscript')))
objs.extend(SConscript(os.path.join(libraries_path_prefix, 'libos', 'SConscript'), variant_dir='build/libraries/libos', duplicate=0))

if rtconfig.PLATFORM == 'gcc':
env['LINKCOM'] = '$LINK -o $TARGET $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS -Wl,--start-group $_LIBFLAGS -Wl,--end-group'
Expand Down
2 changes: 1 addition & 1 deletion bsp/allwinner/libraries/sunxi-hal/hal/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ rtc_path = [cwd + '/../include/hal/rtc']
twi_src = []
twi_path = []
if GetDepend('DRIVERS_TWI'):
twi_src += [cwd + '/source/twi/hal_twi.c']
twi_src += ['source/twi/hal_twi.c']
twi_path += [cwd + '/source/twi']

udc_src = Split('''
Expand Down