The state framework grew organically over the time. Unfortunately the architecture and abstractions disappeared during this period. This patch refactors the framework to recreate the abstractions. The main focus was the backend with its storage. The main use-case was to offer better NAND support with less erase cycles and interchangeable data formats (dtb,raw). The general architecture now has a backend which consists of a data format and storage. The storage consists of multiple storage buckets each holding exactly one copy of the state data. A data format describes a data serialization for the state framework. This can be either dtb or raw. A storage bucket is a storage location which is used to store any data. There is a (new) circular type which writes changes behind the last written data and therefore reduces the number of erases. The other type is a direct bucket which writes directly to a storage offset for all non-erase storage. Furthermore this patch splits up all classes into different files in a subdirectory. This is currently all in one patch as I can't see a good way to split the changes up without having a non-working state framework in between. The following diagram shows the new architecture roughly: .----------. | state | '----------' | | v .----------------------------. | state_backend | |----------------------------| | + state_load(*state); | | + state_save(*state); | | + state_backend_init(...); | | | | | '----------------------------' | | The format describes | | how the state data | '-------------> is serialized | .--------------------------------------------. | | state_backend_format <INTERFACE> | | |--------------------------------------------| | | + verify(*format, magic, *buf, len); | | | + pack(*format, *state, **buf, len); | | | + unpack(*format, *state, *buf, len); | | | + get_packed_len(*format, *state); | | | + free(*format); | | '--------------------------------------------' | ^ ^ | * * | * * | .--------------------. .--------------------. | | backend_format_dtb | | backend_format_raw | | '--------------------' '--------------------' | | | v .----------------------------------------------------------. | state_backend_storage | |----------------------------------------------------------| | + init(...); | | + free(*storage); | | + read(*storage, *format, magic, **buf, *len, len_hint); | | + write(*storage, *buf, len); | | + restore_consistency(*storage, *buf, len); | '----------------------------------------------------------' | The backend storage is responsible to manage multiple data copies and distribute them onto several buckets. Read data is verified against the given format to ensure that the read data is correct. | | | | | v .------------------------------------------. | state_backend_storage_bucket <INTERFACE> | |------------------------------------------| | + init(*bucket); | | + write(*bucket, *buf, len); | | + read(*bucket, **buf, len_hint); | | + free(*bucket); | '------------------------------------------' ^ ^ ^ * * * * * * A storage bucket represents*exactly one data copy at one data location. A circular b*cket writes any new data to the end of the bucket (for *educed erases on NAND). A direct bucket directly writ*s at one location. * * * * * * * * * .-----------------------. * .-------------------------. | backend_bucket_direct | * | backend_bucket_circular | '-----------------------' * '-------------------------' ^ * ^ | * | | * | | * | | .-----------------------. | '--| backend_bucket_cached |---' '-----------------------' A backend_bucket_cached is a transparent bucket that directly uses another bucket as backend device and caches all accesses. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
101 lines
3.3 KiB
Makefile
101 lines
3.3 KiB
Makefile
obj-y += memory.o
|
|
obj-y += memory_display.o
|
|
pbl-$(CONFIG_PBL_CONSOLE) += memory_display.o
|
|
obj-y += clock.o
|
|
obj-y += console_common.o
|
|
obj-y += startup.o
|
|
obj-y += misc.o
|
|
obj-pbl-y += memsize.o
|
|
obj-y += resource.o
|
|
obj-y += bootsource.o
|
|
obj-y += restart.o
|
|
obj-$(CONFIG_AUTO_COMPLETE) += complete.o
|
|
obj-$(CONFIG_BANNER) += version.o
|
|
obj-$(CONFIG_BAREBOX_UPDATE) += bbu.o
|
|
obj-$(CONFIG_BINFMT) += binfmt.o
|
|
obj-$(CONFIG_BLOCK) += block.o
|
|
obj-$(CONFIG_BLSPEC) += blspec.o
|
|
obj-$(CONFIG_BOOTM) += bootm.o
|
|
obj-$(CONFIG_CMD_LOADS) += s_record.o
|
|
obj-$(CONFIG_CMD_MEMTEST) += memtest.o
|
|
obj-$(CONFIG_COMMAND_SUPPORT) += command.o
|
|
obj-$(CONFIG_CONSOLE_FULL) += console.o
|
|
obj-$(CONFIG_CONSOLE_SIMPLE) += console_simple.o
|
|
obj-y += console_countdown.o
|
|
obj-$(CONFIG_DDR_SPD) += ddr_spd.o
|
|
obj-$(CONFIG_ENV_HANDLING) += environment.o
|
|
obj-$(CONFIG_ENVIRONMENT_VARIABLES) += env.o
|
|
obj-$(CONFIG_FILETYPE) += filetype.o
|
|
obj-$(CONFIG_FLEXIBLE_BOOTARGS) += bootargs.o
|
|
obj-$(CONFIG_GLOBALVAR) += globalvar.o
|
|
obj-$(CONFIG_GREGORIAN_CALENDER) += date.o
|
|
obj-$(CONFIG_KALLSYMS) += kallsyms.o
|
|
obj-$(CONFIG_MALLOC_DLMALLOC) += dlmalloc.o
|
|
obj-$(CONFIG_MALLOC_TLSF) += tlsf_malloc.o tlsf.o
|
|
obj-$(CONFIG_MALLOC_DUMMY) += dummy_malloc.o
|
|
obj-$(CONFIG_MEMINFO) += meminfo.o
|
|
obj-$(CONFIG_MENU) += menu.o
|
|
obj-$(CONFIG_MODULES) += module.o
|
|
extra-$(CONFIG_MODULES) += module.lds
|
|
obj-$(CONFIG_OFTREE) += oftree.o
|
|
obj-$(CONFIG_PARTITION_DISK) += partitions.o partitions/
|
|
obj-$(CONFIG_PASSWORD) += password.o
|
|
obj-$(CONFIG_POLLER) += poller.o
|
|
obj-$(CONFIG_RESET_SOURCE) += reset_source.o
|
|
obj-$(CONFIG_SHELL_HUSH) += hush.o
|
|
obj-$(CONFIG_SHELL_SIMPLE) += parser.o
|
|
obj-$(CONFIG_STATE) += state/
|
|
obj-$(CONFIG_RATP) += ratp.o
|
|
obj-$(CONFIG_UIMAGE) += image.o uimage.o
|
|
obj-$(CONFIG_FITIMAGE) += image-fit.o
|
|
obj-$(CONFIG_MENUTREE) += menutree.o
|
|
obj-$(CONFIG_EFI_GUID) += efi-guid.o
|
|
obj-$(CONFIG_EFI_DEVICEPATH) += efi-devicepath.o
|
|
lwl-$(CONFIG_IMD) += imd-barebox.o
|
|
obj-$(CONFIG_IMD) += imd.o
|
|
obj-$(CONFIG_FILE_LIST) += file-list.o
|
|
obj-$(CONFIG_FIRMWARE) += firmware.o
|
|
obj-$(CONFIG_UBIFORMAT) += ubiformat.o
|
|
obj-$(CONFIG_BAREBOX_UPDATE_IMX_NAND_FCB) += imx-bbu-nand-fcb.o
|
|
obj-$(CONFIG_CONSOLE_RATP) += ratp.o
|
|
|
|
quiet_cmd_pwd_h = PWDH $@
|
|
ifdef CONFIG_PASSWORD
|
|
ifneq ($(CONFIG_PASSWORD_DEFAULT),"")
|
|
PASSWD_FILE := $(shell cd $(srctree); find $(CONFIG_PASSWORD_DEFAULT) -type f)
|
|
cmd_pwd_h = echo -n "static const char default_passwd[] = \"" > $@; \
|
|
cat $< | tr -d '\n' >> $@; \
|
|
echo "\";" >> $@
|
|
|
|
include/generated/passwd.h: $(PASSWD_FILE)
|
|
$(call if_changed,pwd_h)
|
|
else
|
|
cmd_pwd_h = echo "static const char default_passwd[] = \"\";" > $@
|
|
|
|
include/generated/passwd.h: FORCE
|
|
$(call if_changed,pwd_h)
|
|
endif
|
|
|
|
targets += include/generated/passwd.h
|
|
|
|
$(obj)/password.o: include/generated/passwd.h
|
|
endif
|
|
|
|
# dependencies on generated files need to be listed explicitly
|
|
$(obj)/version.o: include/generated/compile.h
|
|
$(obj)/imd-barebox.o: include/generated/compile.h
|
|
|
|
# compile.h changes depending on hostname, generation number, etc,
|
|
# so we regenerate it always.
|
|
# mkcompile_h will make sure to only update the
|
|
# actual file if its content has changed.
|
|
|
|
chk_compile.h = :
|
|
quiet_chk_compile.h = echo ' CHK $@'
|
|
silent_chk_compile.h = :
|
|
include/generated/compile.h: FORCE
|
|
@$($(quiet)chk_compile.h)
|
|
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \
|
|
"$(UTS_MACHINE)" "$(CC) $(KBUILD_CFLAGS)"
|
|
|